saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #51221 from Ch3LL/bp-50540

Browse source 
Backport #50538 into 2019.2
This commit is contained in:
Gareth J. Greenaway 2019-01-18 14:42:35 -08:00 • committed by GitHub
commit 0ccd5c37bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
salt/modules/pdbedit.py
View file

@ -92,29 +92,34 @@ def list_users(verbose=True, hashes=False):
if res['retcode'] > 0:
log.error(res['stderr'] if 'stderr' in res else res['stdout'])
else:
user_data = {}
for user in res['stdout'].splitlines():
if user.startswith('-'):
if len(user_data) > 0:
users[user_data['unix username']] = user_data
user_data = {}
else:
label = user[:user.index(':')].strip().lower()
data = user[(user.index(':')+1):].strip()
user_data[label] = data
return users
if len(user_data) > 0:
users[user_data['unix username']] = user_data
user_data = {}
for user in res['stdout'].splitlines():
if user.startswith('-'):
if 'unix username' in user_data:
users[user_data['unix username']] = user_data
user_data = {}
elif ':' in user:
label = user[:user.index(':')].strip().lower()
data = user[(user.index(':')+1):].strip()
user_data[label] = data
if user_data:
users[user_data['unix username']] = user_data
else:
# list users
res = __salt__['cmd.run_all']('pdbedit --list')
if res['retcode'] > 0:
return {'Error': res['stderr'] if 'stderr' in res else res['stdout']}
else:
for user in res['stdout'].splitlines():
users.append(user.split(':')[0])
for user in res['stdout'].splitlines():
if ':' not in user:
continue
user_data = user.split(':')
if len(user_data) >= 3:
users.append(user_data[0])
return users