Commit 621708e9 by Michael DeHaan

user module should be using module.BOOLEANS for choices

parent aa98c84a
...@@ -125,9 +125,9 @@ if os.path.exists('/etc/master.passwd'): ...@@ -125,9 +125,9 @@ if os.path.exists('/etc/master.passwd'):
def user_del(module, user, **kwargs): def user_del(module, user, **kwargs):
cmd = [module.get_bin_path('userdel', True)] cmd = [module.get_bin_path('userdel', True)]
for key in kwargs: for key in kwargs:
if key == 'force' and kwargs[key] == 'yes': if key == 'force' and module.boolean(kwargs[key]):
cmd.append('-f') cmd.append('-f')
elif key == 'remove' and kwargs[key] == 'yes': elif key == 'remove' and module.boolean(kwargs[key]):
cmd.append('-r') cmd.append('-r')
cmd.append(user) cmd.append(user)
p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
...@@ -166,11 +166,12 @@ def user_add(module, user, **kwargs): ...@@ -166,11 +166,12 @@ def user_add(module, user, **kwargs):
cmd.append(kwargs[key]) cmd.append(kwargs[key])
elif key == 'createhome': elif key == 'createhome':
if kwargs[key] is not None: if kwargs[key] is not None:
if kwargs[key] == 'yes': value = module.boolean(kwargs[key])
if value:
cmd.append('-m') cmd.append('-m')
else: else:
cmd.append('-M') cmd.append('-M')
elif key == 'system' and kwargs[key] == 'yes': elif key == 'system' and module.boolean(kwargs[key]):
cmd.append('-r') cmd.append('-r')
cmd.append(user) cmd.append(user)
p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
...@@ -207,7 +208,7 @@ def user_mod(module, user, **kwargs): ...@@ -207,7 +208,7 @@ def user_mod(module, user, **kwargs):
groups_need_mod = False groups_need_mod = False
if group_diff: if group_diff:
if kwargs['append'] is not None and kwargs['append'] == 'yes': if kwargs['append'] is not None and module.boolean(kwargs['append']):
for g in groups: for g in groups:
if g in group_diff: if g in group_diff:
cmd.append('-a') cmd.append('-a')
...@@ -323,13 +324,13 @@ def main(): ...@@ -323,13 +324,13 @@ def main():
shell=dict(default=None), shell=dict(default=None),
password=dict(default=None), password=dict(default=None),
# following options are specific to userdel # following options are specific to userdel
force=dict(default='no', choices=['yes', 'no']), force=dict(default='no', choices=BOOLEANS),
remove=dict(default='no', choices=['yes', 'no']), remove=dict(default='no', choices=BOOLEANS),
# following options are specific to useradd # following options are specific to useradd
createhome=dict(default='yes', choices=['yes', 'no']), createhome=dict(default='yes', choices=BOOLEANS),
system=dict(default='no', choices=['yes', 'no']), system=dict(default='no', choices=BOOLEANS),
# following options are specific to usermod # following options are specific to usermod
append=dict(default='no', choices=['yes', 'no']), append=dict(default='no', choices=BOOLEANS)
) )
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment