From b36fc23a50a749c7ae90c95506b0bfcd83e9f394 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Kliemeck Date: Tue, 22 Mar 2016 09:07:09 +0100 Subject: [PATCH] suggestion by @nitzmahone to not use Get-Attr in combination with ConvertTo-Bool, improved documentation regarding organize --- lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 | 3 ++- lib/ansible/modules/extras/windows/win_acl_inheritance.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 b/lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 index 0d808bb8c4..1933a3a5dd 100644 --- a/lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 +++ b/lib/ansible/modules/extras/windows/win_acl_inheritance.ps1 @@ -27,7 +27,8 @@ Set-Attr $result "changed" $false; $path = Get-Attr $params "path" -failifempty $true $state = Get-Attr $params "state" "absent" -validateSet "present","absent" -resultobj $result -$reorganize = Get-Attr $params "reorganize" "no" -validateSet "no","yes" -resultobj $result | ConvertTo-Bool +$reorganize = Get-Attr $params "reorganize" "no" -validateSet "no","yes" -resultobj $result +$reorganize = $reorganize | ConvertTo-Bool If (-Not (Test-Path -Path $path)) { Fail-Json $result "$path file or directory does not exist on the host" diff --git a/lib/ansible/modules/extras/windows/win_acl_inheritance.py b/lib/ansible/modules/extras/windows/win_acl_inheritance.py index 0837bab320..a4bb90a47b 100644 --- a/lib/ansible/modules/extras/windows/win_acl_inheritance.py +++ b/lib/ansible/modules/extras/windows/win_acl_inheritance.py @@ -43,7 +43,8 @@ options: default: absent reorganize: description: - - For P(state) = I(absent), indicates if the inherited ACE's should be copied. For P(state) = I(present), indicates if the inherited ACE's should be simplified. + - For P(state) = I(absent), indicates if the inherited ACE's should be copied from the parent directory. This is necessary (in combination with removal) for a simple ACL instead of using multiple ACE deny entries. + - For P(state) = I(present), indicates if the inherited ACE's should be deduplicated compared to the parent directory. This removes complexity of the ACL structure. required: false choices: - no