s3-security: remove duplicate Extra W2K flags.

Guenther

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index 1eefbc92da209bfe5c976ccd85b8d1d0efdc1b56..a0bc32ca729d20bec973d0446621c74be094ac36 100644 (file)
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -24,18 +24,12 @@
 /* for ADS */
 #define SEC_RIGHTS_FULL_CTRL           0xf01ff
 
-/* Extra W2K flags. */
-#define UNPROTECTED_SACL_SECURITY_INFORMATION  0x10000000
-#define UNPROTECTED_DACL_SECURITY_INFORMATION  0x20000000
-#define PROTECTED_SACL_SECURITY_INFORMATION    0x40000000
-#define PROTECTED_DACL_SECURITY_INFORMATION    0x80000000
-
 #define ALL_SECURITY_INFORMATION (SECINFO_OWNER|SECINFO_GROUP|\
                                        SECINFO_DACL|SECINFO_SACL|\
-                                       UNPROTECTED_SACL_SECURITY_INFORMATION|\
-                                       UNPROTECTED_DACL_SECURITY_INFORMATION|\
-                                       PROTECTED_SACL_SECURITY_INFORMATION|\
-                                       PROTECTED_DACL_SECURITY_INFORMATION)
+                                       SECINFO_UNPROTECTED_SACL|\
+                                       SECINFO_UNPROTECTED_DACL|\
+                                       SECINFO_PROTECTED_SACL|\
+                                       SECINFO_PROTECTED_DACL)
 
 /* A type to describe the mapping of generic access rights to object
    specific access rights. */

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index a809b909b3b3ad74c6ee0e926a4b3e4c237d8665..2f2c90161cfdf9db072b59a27fe1904fbe685573 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -3206,7 +3206,7 @@ static NTSTATUS posix_get_nt_acl_common(struct connection_struct *conn,
                num_profile_acls = 3;
        }
 
-       if ((security_info & SECINFO_DACL) && !(security_info & PROTECTED_DACL_SECURITY_INFORMATION)) {
+       if ((security_info & SECINFO_DACL) && !(security_info & SECINFO_PROTECTED_DACL)) {
 
                /*
                 * In the optimum case Creator Owner and Creator Group would be used for