summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-10-09 16:22:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:31:16 -0500
commit07cbec10b1f7c43535c2dcedb627e0faefdf4b9a (patch)
treea6ae943c1d90a75d169290a38f4ff1eafbb38e2e /source3
parent5de28a07cc3195d13626a3bf4579a565dcf8b9d1 (diff)
downloadsamba-07cbec10b1f7c43535c2dcedb627e0faefdf4b9a.tar.gz
samba-07cbec10b1f7c43535c2dcedb627e0faefdf4b9a.tar.bz2
samba-07cbec10b1f7c43535c2dcedb627e0faefdf4b9a.zip
r25593: Add missing security_secinfo bits as seen while managing security descriptor
inheritance with regedit. Guenther (This used to be commit 534ee13596cd4d95b61ae973823b3041bd889216)
Diffstat (limited to 'source3')
-rw-r--r--source3/librpc/idl/security.idl6
-rw-r--r--source3/librpc/ndr/ndr_sec_helper.c4
-rw-r--r--source3/librpc/ndr/security.h4
3 files changed, 13 insertions, 1 deletions
diff --git a/source3/librpc/idl/security.idl b/source3/librpc/idl/security.idl
index 8bf5e6f867..8a0d36a696 100644
--- 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 d31a18ca82..a94f4873d0 100644
--- 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 61e0ea313f..99f7daf2bd 100644
--- 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 */