cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

FreeBSD user mod only fires when there are changes

Browse source 
Also fix missing -G on groups change
This commit is contained in:
Nigel Metheringham 2012-11-04 12:09:19 +00:00
parent 1ab1c8d374
commit f905e751ac
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/user
View file

@ -568,6 +568,7 @@ class FreeBsdUser(User):
'usermod', 'usermod',
'-n', '-n',
self.name ] self.name ]
cmd_len = len(cmd)
info = self.user_info() info = self.user_info()
if self.uid is not None and info[2] != int(self.uid): if self.uid is not None and info[2] != int(self.uid):
@ -614,15 +615,19 @@ class FreeBsdUser(User):
groups_need_mod = True groups_need_mod = True
if groups_need_mod: if groups_need_mod:
cmd.append('-G')
new_groups = groups new_groups = groups
if self.append: if self.append:
new_groups.append(current_groups) new_groups.append(current_groups)
cmd.append(','.join(new_groups)) cmd.append(','.join(new_groups))
# modify the user # modify the user if cmd will do anything
(rc, out, err) = self.execute_command(cmd) if cmd_len != len(cmd):
if rc is not None and rc != 0: (rc, out, err) = self.execute_command(cmd)
module.fail_json(name=self.name, msg=err, rc=rc) 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 # we have to set the password in a second command
if self.password is not None and info[1] != self.password: if self.password is not None and info[1] != self.password: