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

Minor win_user fixes based on feedback.

Browse source
This commit is contained in:
Chris Church 2014-11-24 00:43:55 -05:00
parent 3a40d79cff
commit 07faee61de
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
windows/win_user.ps1
View file

@ -150,8 +150,9 @@ If ($state -eq 'present') {
} }
ElseIf (($password -ne $null) -and ($update_password -eq 'always')) { ElseIf (($password -ne $null) -and ($update_password -eq 'always')) {
[void][system.reflection.assembly]::LoadWithPartialName('System.DirectoryServices.AccountManagement') [void][system.reflection.assembly]::LoadWithPartialName('System.DirectoryServices.AccountManagement')
$pc = New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalContext 'Machine', $env:COMPUTERNAME $host_name = [System.Net.Dns]::GetHostName()
# FIXME: ValidateCredentials fails if PasswordExpired == 1 $pc = New-Object -TypeName System.DirectoryServices.AccountManagement.PrincipalContext 'Machine', $host_name
# ValidateCredentials fails if PasswordExpired == 1
If (!$pc.ValidateCredentials($username, $password)) { If (!$pc.ValidateCredentials($username, $password)) {
$user_obj.SetPassword($password) $user_obj.SetPassword($password)
$result.changed = $true $result.changed = $true
@ -195,6 +196,9 @@ If ($state -eq 'present') {
$user_obj.IsAccountLocked = $account_locked $user_obj.IsAccountLocked = $account_locked
$result.changed = $true $result.changed = $true
} }
If ($result.changed) {
$user_obj.SetInfo()
}
If ($groups.GetType) { If ($groups.GetType) {
[string[]]$current_groups = $user_obj.Groups() | ForEach { $_.GetType().InvokeMember("Name", "GetProperty", $null, $_, $null) } [string[]]$current_groups = $user_obj.Groups() | ForEach { $_.GetType().InvokeMember("Name", "GetProperty", $null, $_, $null) }
If (($groups_action -eq "remove") -or ($groups_action -eq "replace")) { If (($groups_action -eq "remove") -or ($groups_action -eq "replace")) {
@ -226,9 +230,6 @@ If ($state -eq 'present') {
} }
} }
} }
If ($result.changed) {
$user_obj.SetInfo()
}
} }
catch { catch {
Fail-Json $result $_.Exception.Message Fail-Json $result $_.Exception.Message