From 4ed4bfff907eda8a84a60a849b031cf49c258b28 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 28 Apr 2014 12:29:57 +0200 Subject: [PATCH] Do not fail if we try to generate a ssh key for a user without being root If we try to use the user module without being root, it fail on RHEL/Fedora because usermod --help cannot be run. The root cause is lack of permission due to EAL4+ certification, as seen in shadow-utils changelo. So if we cannot run it, assume there is no append. It doesn't matter much since we will not be able to run usermod at all with or without the option. --- system/user | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/user b/system/user index 8c649c0607c..0c1026fffa2 100644 --- a/system/user +++ b/system/user @@ -336,8 +336,14 @@ class User(object): def _check_usermod_append(self): # check if this version of usermod can append groups + usermod_path = self.module.get_bin_path('usermod', True) - cmd = [self.module.get_bin_path('usermod', True)] + # for some reason, usermod --help cannot be used by non root + # on RH/Fedora, due to lack of execute bit for others + if not os.access(usermod_path, os.X_OK): + return False + + cmd = [usermod_path] cmd.append('--help') rc, data1, data2 = self.execute_command(cmd) helpout = data1 + data2