From f905e751ac3209b158000aff950c1cf6ae837249 Mon Sep 17 00:00:00 2001 From: Nigel Metheringham Date: Sun, 4 Nov 2012 12:09:19 +0000 Subject: [PATCH] FreeBSD user mod only fires when there are changes Also fix missing -G on groups change --- library/user | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/library/user b/library/user index 961b17b35a5..afa2364aed5 100755 --- a/library/user +++ b/library/user @@ -568,6 +568,7 @@ class FreeBsdUser(User): 'usermod', '-n', self.name ] + cmd_len = len(cmd) info = self.user_info() if self.uid is not None and info[2] != int(self.uid): @@ -614,15 +615,19 @@ class FreeBsdUser(User): groups_need_mod = True if groups_need_mod: + cmd.append('-G') new_groups = groups if self.append: new_groups.append(current_groups) cmd.append(','.join(new_groups)) - # modify the user - (rc, out, err) = self.execute_command(cmd) - if rc is not None and rc != 0: - module.fail_json(name=self.name, msg=err, rc=rc) + # modify the user if cmd will do anything + if cmd_len != len(cmd): + (rc, out, err) = self.execute_command(cmd) + if rc is not None and rc != 0: + module.fail_json(name=self.name, msg=err, rc=rc) + else: + (rc, out, err) = (None, '', '') # we have to set the password in a second command if self.password is not None and info[1] != self.password: