cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed problems related to userpricincipalname (user@domain) and undefined variables

Browse source 
fixed variable capitalization
This commit is contained in:
Hans-Joachim Kliemeck 2016-01-12 09:52:08 +01:00
parent 0688522eb7
commit fe4429ba3e
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
windows/win_acl.ps1
View file

@ -27,52 +27,49 @@
#Functions #Functions
Function UserSearch Function UserSearch
{ {
Param ([string]$AccountName) Param ([string]$accountName)
#Check if there's a realm specified #Check if there's a realm specified
if ($AccountName.Split("\").count -gt 1)
$searchDomain = $false
$searchDomainUPN = $false
if ($accountName.Split("\").count -gt 1)
{ {
if ($AccountName.Split("\")[0] -eq $env:COMPUTERNAME) if ($accountName.Split("\")[0] -ne $env:COMPUTERNAME)
{ {
$IsLocalAccount = $true $searchDomain = $true
$accountName = $accountName.split("\")[1]
} }
Else
{
$IsDomainAccount = $true
$IsUpn = $false
}
} }
Elseif ($AccountName.contains("@")) Elseif ($accountName.contains("@"))
{ {
$IsDomainAccount = $true $searchDomain = $true
$IsUpn = $true $searchDomainUPN = $true
} }
Else Else
{ {
#Default to local user account #Default to local user account
$accountname = $env:COMPUTERNAME + "\" + $AccountName $accountName = $env:COMPUTERNAME + "\" + $accountName
$IsLocalAccount = $true
} }
if ($IsLocalAccount -eq $true) if ($searchDomain -eq $false)
{ {
# do not use Win32_UserAccount, because e.g. SYSTEM (BUILTIN\SYSTEM or COMPUUTERNAME\SYSTEM) will not be listed. on Win32_Account groups will be listed too # do not use Win32_UserAccount, because e.g. SYSTEM (BUILTIN\SYSTEM or COMPUUTERNAME\SYSTEM) will not be listed. on Win32_Account groups will be listed too
$localaccount = get-wmiobject -class "Win32_Account" -namespace "root\CIMV2" -filter "(LocalAccount = True)" | where {$_.Caption -eq $AccountName} $localaccount = get-wmiobject -class "Win32_Account" -namespace "root\CIMV2" -filter "(LocalAccount = True)" | where {$_.Caption -eq $accountName}
if ($localaccount) if ($localaccount)
{ {
return $localaccount.SID return $localaccount.SID
} }
} }
ElseIf ($IsDomainAccount -eq $true) Else
{ {
#Search by samaccountname #Search by samaccountname
$Searcher = [adsisearcher]"" $Searcher = [adsisearcher]""
If ($IsUpn -eq $false) { If ($searchDomainUPN -eq $false) {
$Searcher.Filter = "sAMAccountName=$($accountname.split("\")[1])" $Searcher.Filter = "sAMAccountName=$($accountName)"
} }
Else { Else {
$Searcher.Filter = "userPrincipalName=$($accountname)" $Searcher.Filter = "userPrincipalName=$($accountName)"
} }
$result = $Searcher.FindOne() $result = $Searcher.FindOne()