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

Revert "lint"

Browse Source 
This reverts commit 8a719fcb66.
This commit is contained in:
Colton Myers 2015-05-06 10:38:18 -06:00
parent b3c50c2640
commit fbeb8f4139
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/win_groupadd.py
View File

@ -467,7 +467,7 @@ def _fixlocaluser(username):
user_info = win32security.LookupAccountSid(
None, pywintypes.SID(nt.GetObject('', 'WinNT://./' + username).objectSID))
username = (('{0}\\{1}').format(user_info[1], user_info[0]))
except Exception:
except:
username = ('{0}\\{1}').format(__salt__['grains.get']('host').upper(), username)
return username
@ -487,5 +487,5 @@ def _getnetbiosusernamefromsid(adspath):
user_info = win32security.LookupAccountSid(
None, pywintypes.SID(nt.GetObject('', adspath).objectSID))
return ('{0}\\{1}').format(user_info[1], user_info[0])
except Exception:
except:
return adspath.replace('WinNT://', '').replace('/', '\\')

4
salt/modules/win_useradd.py
View File

@ -981,7 +981,7 @@ def _getnetbiosusernamefromsid(adspath):
user_info = win32security.LookupAccountSid(
None, pywintypes.SID(nt.GetObject('', adspath).objectSID))
return ('{0}\\{1}').format(user_info[1], user_info[0])
except Exception:
except:
return adspath.replace('WinNT://', '').replace('/', '\\')
@ -999,7 +999,7 @@ def _fixlocaluser(username):
user_info = win32security.LookupAccountSid(
None, pywintypes.SID(nt.GetObject('', 'WinNT://./' + username).objectSID))
username = (('{0}\\{1}').format(user_info[1], user_info[0]))
except Exception:
except:
username = ('{0}\\{1}').format(__salt__['grains.get']('host'), username)
return username