valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #28849 from mscherer/fix_28835

Browse Source 
Do not accept comma in GECOS field
This commit is contained in:
Mike Place 2015-11-16 07:27:43 -07:00
commit c2e8cf09c1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/states/user.py
View File

@ -373,6 +373,14 @@ def present(name,
'result': True, 'result': True,
'comment': 'User {0} is present and up to date'.format(name)} 'comment': 'User {0} is present and up to date'.format(name)}
# the comma is used to separate field in GECOS, thus resulting into
# salt adding the end of fullname each time this function is called
for gecos_field in ['fullname', 'roomnumber', 'workphone', 'homephone']:
if isinstance(locals()[gecos_field], type('')) and ',' in locals()[gecos_field]:
ret['comment'] = "Unsupported char ',' in {0}".format(gecos_field)
ret['result'] = False
return ret
if groups: if groups:
missing_groups = [x for x in groups if not __salt__['group.info'](x)] missing_groups = [x for x in groups if not __salt__['group.info'](x)]
if missing_groups: if missing_groups: