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

pdbedit.modify supports chaging user and machine SID

Browse Source
This commit is contained in:
Super-User 2016-10-21 17:52:11 +00:00
parent 49aaecc73a
commit cdb41b3fae
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
salt/modules/pdbedit.py
View File

@ -210,7 +210,8 @@ def modify(
login, password=None, password_hashed=False,
domain=None, profile=None, script=None,
drive=None, homedir=None, fullname=None,
account_desc=None):
account_desc=None, machine_sid=None, user_sid=None,
):
'''
Modify user account
@ -221,7 +222,7 @@ def modify(
password_hashed : boolean
set if password is a nt hash instead of plain text
domain : string
user domain
users domain
profile : string
profile path
script : string
@ -234,6 +235,10 @@ def modify(
full name
account_desc : string
account description
machine_sid : string
specify the machines new primary group SID or rid
user_sid : string
specify the users new primary group SID or rid
CLI Example:
@ -245,13 +250,15 @@ def modify(
'''
## flag mapping
flags = {
'domain': 'domain',
'full name': 'fullname',
'account desc': 'account-desc',
'home directory': 'homedir',
'homedir drive': 'drive',
'profile path': 'profile',
'logon script': 'script',
'domain': '--domain=',
'full name': '--fullname=',
'account desc': '--account-desc=',
'home directory': '--homedir=',
'homedir drive': '--drive=',
'profile path': '--profile=',
'logon script': '--script=',
'user sid': '-U ',
'machine sid': '-M ',
}
## field mapping
@ -263,6 +270,8 @@ def modify(
'homedir drive': drive,
'profile path': profile,
'logon script': script,
'user sid': user_sid,
'machine sid': machine_sid,
}
## update password
@ -275,13 +284,17 @@ def modify(
current = get_user(login, hashes=True)
changes = {}
for key, val in provided.items():
if val is not None and current[key] != val:
changes[key] = val
if key in ['user sid', 'machine sid']:
if val is not None and key in current and not current[key].endswith(str(val)):
changes[key] = str(val)
else:
if val is not None and key in current and current[key] != val:
changes[key] = val
if len(changes) > 0:
cmds = []
for change in changes:
cmds.append('--{flag}={value}'.format(
cmds.append('{flag}{value}'.format(
flag=flags[change],
value=_quote_args(changes[change]),
))