Rob Shearman : ntdll: Fix RtlValidAcl to accept newer ACL revisions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 06b2da95604a830bf3cd035906348b515b31254b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=06b2da95604a830bf3cd035906...

Author: Rob Shearman 
Date:   Tue Oct 23 13:39:02 2007 +0100

ntdll: Fix RtlValidAcl to accept newer ACL revisions.

---

dlls/advapi32/tests/security.c |    2 --
 dlls/ntdll/sec.c               |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 62463a7..3332d7b 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2300,14 +2300,12 @@ static void test_acls(void)
     ok(ret, "InitializeAcl(ACL_REVISION3) failed with error %d\n", GetLastError());

ret = IsValidAcl(pAcl);
-    todo_wine
     ok(ret, "IsValidAcl failed with error %d\n", GetLastError());

ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION4);
     ok(ret, "InitializeAcl(ACL_REVISION4) failed with error %d\n", GetLastError());

ret = IsValidAcl(pAcl);
-    todo_wine
     ok(ret, "IsValidAcl failed with error %d\n", GetLastError());

SetLastError(0xdeadbeef);
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index f195678..a1c839d 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -1278,7 +1278,8 @@ BOOLEAN WINAPI RtlValidAcl(PACL pAcl)
    	PACE_HEADER	ace;
    	int		i;

-                if (pAcl->AclRevision != ACL_REVISION)
+                if (pAcl->AclRevision < MIN_ACL_REVISION ||
+                    pAcl->AclRevision > MAX_ACL_REVISION)
                     ret = FALSE;
                 else
                 {