Author: gd Date: 2007-10-09 16:22:16 +0000 (Tue, 09 Oct 2007) New Revision: 25593
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25593 Log: Add missing security_secinfo bits as seen while managing security descriptor inheritance with regedit. Guenther Modified: branches/SAMBA_3_2/source/librpc/idl/security.idl branches/SAMBA_3_2/source/librpc/ndr/ndr_sec_helper.c branches/SAMBA_3_2/source/librpc/ndr/security.h branches/SAMBA_3_2_0/source/librpc/idl/security.idl branches/SAMBA_3_2_0/source/librpc/ndr/ndr_sec_helper.c branches/SAMBA_3_2_0/source/librpc/ndr/security.h Changeset: Modified: branches/SAMBA_3_2/source/librpc/idl/security.idl =================================================================== --- branches/SAMBA_3_2/source/librpc/idl/security.idl 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2/source/librpc/idl/security.idl 2007-10-09 16:22:16 UTC (rev 25593) @@ -350,6 +350,10 @@ 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; } Modified: branches/SAMBA_3_2/source/librpc/ndr/ndr_sec_helper.c =================================================================== --- branches/SAMBA_3_2/source/librpc/ndr/ndr_sec_helper.c 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2/source/librpc/ndr/ndr_sec_helper.c 2007-10-09 16:22:16 UTC (rev 25593) @@ -897,6 +897,10 @@ 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--; } Modified: branches/SAMBA_3_2/source/librpc/ndr/security.h =================================================================== --- branches/SAMBA_3_2/source/librpc/ndr/security.h 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2/source/librpc/ndr/security.h 2007-10-09 16:22:16 UTC (rev 25593) @@ -249,5 +249,9 @@ #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 */ Modified: branches/SAMBA_3_2_0/source/librpc/idl/security.idl =================================================================== --- branches/SAMBA_3_2_0/source/librpc/idl/security.idl 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2_0/source/librpc/idl/security.idl 2007-10-09 16:22:16 UTC (rev 25593) @@ -350,6 +350,10 @@ 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; } Modified: branches/SAMBA_3_2_0/source/librpc/ndr/ndr_sec_helper.c =================================================================== --- branches/SAMBA_3_2_0/source/librpc/ndr/ndr_sec_helper.c 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2_0/source/librpc/ndr/ndr_sec_helper.c 2007-10-09 16:22:16 UTC (rev 25593) @@ -897,6 +897,10 @@ 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--; } Modified: branches/SAMBA_3_2_0/source/librpc/ndr/security.h =================================================================== --- branches/SAMBA_3_2_0/source/librpc/ndr/security.h 2007-10-09 13:53:40 UTC (rev 25592) +++ branches/SAMBA_3_2_0/source/librpc/ndr/security.h 2007-10-09 16:22:16 UTC (rev 25593) @@ -249,5 +249,9 @@ #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 */
