r25593: Add missing security_secinfo bits as seen while managing security descriptor

inheritance with regedit.

Guenther
(This used to be commit 534ee13596cd4d95b61ae973823b3041bd889216)

diff --git a/source3/librpc/idl/security.idl b/source3/librpc/idl/security.idl
index 8bf5e6f867c3ee8cc08522121ce7d6469e587923..8a0d36a696f8d3980949235054937e9ae4ba6211 100644 (file)
--- a/source3/librpc/idl/security.idl
+++ b/source3/librpc/idl/security.idl
@@ -350,6 +350,10 @@ interface security
                SECINFO_OWNER                = 0x00000001,
                SECINFO_GROUP                = 0x00000002,
                SECINFO_DACL                 = 0x00000004,
-               SECINFO_SACL                 = 0x00000008
+               SECINFO_SACL                 = 0x00000008,
+               SECINFO_UNPROTECTED_SACL     = 0x10000000,
+               SECINFO_UNPROTECTED_DACL     = 0x20000000,
+               SECINFO_PROTECTED_SACL       = 0x40000000,
+               SECINFO_PROTECTED_DACL       = 0x80000000
        } security_secinfo;
 }

diff --git a/source3/librpc/ndr/ndr_sec_helper.c b/source3/librpc/ndr/ndr_sec_helper.c
index d31a18ca823936ce52942b47806a43af89631341..a94f4873d05514ad2d531f08de29e792bf3492d1 100644 (file)
--- a/source3/librpc/ndr/ndr_sec_helper.c
+++ b/source3/librpc/ndr/ndr_sec_helper.c
@@ -897,6 +897,10 @@ void ndr_print_security_secinfo(struct ndr_print *ndr, const char *name, uint32_
        ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_GROUP", SECINFO_GROUP, r);
        ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_DACL", SECINFO_DACL, r);
        ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_SACL", SECINFO_SACL, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_SACL", SECINFO_UNPROTECTED_SACL, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_DACL", SECINFO_UNPROTECTED_DACL, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_PROTECTED_SACL", SECINFO_PROTECTED_SACL, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_PROTECTED_DACL", SECINFO_PROTECTED_DACL, r);
        ndr->depth--;
 }
 

diff --git a/source3/librpc/ndr/security.h b/source3/librpc/ndr/security.h
index 61e0ea313f74318f7eaf83b680a0f0bb03da7f7d..99f7daf2bd0bab45503d8e23ef4ea54bcd9b3689 100644 (file)
--- a/source3/librpc/ndr/security.h
+++ b/source3/librpc/ndr/security.h
@@ -249,5 +249,9 @@ struct security_token {
 #define SECINFO_GROUP ( 0x00000002 )
 #define SECINFO_DACL ( 0x00000004 )
 #define SECINFO_SACL ( 0x00000008 )
+#define SECINFO_UNPROTECTED_SACL ( 0x10000000 )
+#define SECINFO_UNPROTECTED_DACL ( 0x20000000 )
+#define SECINFO_PROTECTED_SACL ( 0x40000000 )
+#define SECINFO_PROTECTED_DACL ( 0x80000000 )
 
 #endif /* _HEADER_security */