ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

added userprincipal support

Browse source
This commit is contained in:
Hans-Joachim Kliemeck 2015-10-17 23:10:56 +02:00 committed by Matt Clay
parent 65d5658553
commit de4a271dd0
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/extras/windows/win_owner.ps1
View file

@ -49,7 +49,6 @@ Function UserSearch
$IsLocalAccount = $true $IsLocalAccount = $true
} }
if ($IsLocalAccount -eq $true) if ($IsLocalAccount -eq $true)
{ {
# 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
@ -59,13 +58,19 @@ Function UserSearch
return $localaccount.SID return $localaccount.SID
} }
} }
ElseIf (($IsDomainAccount -eq $true) -and ($IsUpn -eq $false)) ElseIf ($IsDomainAccount -eq $true)
{ {
#Search by samaccountname #Search by samaccountname
$Searcher = [adsisearcher]"" $Searcher = [adsisearcher]""
$Searcher.Filter = "sAMAccountName=$($accountname.split("\")[1])"
$result = $Searcher.FindOne()
If ($IsUpn -eq $false) {
$Searcher.Filter = "sAMAccountName=$($accountname.split("\")[1])"
}
Else {
$Searcher.Filter = "userPrincipalName=$($accountname)"
}
$result = $Searcher.FindOne()
if ($result) if ($result)
{ {
$user = $result.GetDirectoryEntry() $user = $result.GetDirectoryEntry()
@ -77,7 +82,6 @@ Function UserSearch
return (New-Object System.Security.Principal.SecurityIdentifier($binarySID,0)).Value return (New-Object System.Security.Principal.SecurityIdentifier($binarySID,0)).Value
} }
} }
} }
$params = Parse-Args $args; $params = Parse-Args $args;