Regenerated pidl output.

diff --git a/source3/librpc/gen_ndr/ndr_security.c b/source3/librpc/gen_ndr/ndr_security.c
index d54fdb2395ebda7240fcb2c04021c7a1f958d61f..de899241ab5b701b61a91edf8abfe210a06df01b 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_security.c
+++ b/source3/librpc/gen_ndr/ndr_security.c
@@ -1024,3 +1024,29 @@ _PUBLIC_ void ndr_print_security_secinfo(struct ndr_print *ndr, const char *name
        ndr->depth--;
 }
 
+_PUBLIC_ enum ndr_err_code ndr_push_kerb_EncTypes(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_kerb_EncTypes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+       uint32_t v;
+       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       *r = v;
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_kerb_EncTypes(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+       ndr_print_uint32(ndr, name, r);
+       ndr->depth++;
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "KERB_ENCTYPE_DES_CBC_CRC", KERB_ENCTYPE_DES_CBC_CRC, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "KERB_ENCTYPE_DES_CBC_MD5", KERB_ENCTYPE_DES_CBC_MD5, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "KERB_ENCTYPE_RC4_HMAC_MD5", KERB_ENCTYPE_RC4_HMAC_MD5, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96", KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96, r);
+       ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96", KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96, r);
+       ndr->depth--;
+}
+

diff --git a/source3/librpc/gen_ndr/ndr_security.h b/source3/librpc/gen_ndr/ndr_security.h
index 79bfd78f5155d268565d6af50e3e13b7fee92341..7a2ff7430970162fa568531579166e21b233e0d3 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_security.h
+++ b/source3/librpc/gen_ndr/ndr_security.h
@@ -38,4 +38,7 @@ void ndr_print_security_token(struct ndr_print *ndr, const char *name, const str
 enum ndr_err_code ndr_push_security_secinfo(struct ndr_push *ndr, int ndr_flags, uint32_t r);
 enum ndr_err_code ndr_pull_security_secinfo(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
 void ndr_print_security_secinfo(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_kerb_EncTypes(struct ndr_push *ndr, int ndr_flags, uint32_t r);
+enum ndr_err_code ndr_pull_kerb_EncTypes(struct ndr_pull *ndr, int ndr_flags, uint32_t *r);
+void ndr_print_kerb_EncTypes(struct ndr_print *ndr, const char *name, uint32_t r);
 #endif /* _HEADER_NDR_security */

diff --git a/source3/librpc/gen_ndr/security.h b/source3/librpc/gen_ndr/security.h
index 04655b178e2e6fc26787e98c50b0cce63d59a234..5b77d76b502003c92f498326577e2270d91e443d 100644 (file)
--- a/source3/librpc/gen_ndr/security.h
+++ b/source3/librpc/gen_ndr/security.h
@@ -59,6 +59,7 @@
 #define SEC_ADS_DELETE_TREE    ( 0x00000040 )
 #define SEC_ADS_LIST_OBJECT    ( 0x00000080 )
 #define SEC_ADS_CONTROL_ACCESS ( 0x00000100 )
+#define SEC_MASK_INVALID       ( 0x0ce0fe00 )
 #define SEC_RIGHTS_FILE_READ   ( SEC_STD_READ_CONTROL|SEC_STD_SYNCHRONIZE|SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_READ_EA )
 #define SEC_RIGHTS_FILE_WRITE  ( SEC_STD_READ_CONTROL|SEC_STD_SYNCHRONIZE|SEC_FILE_WRITE_DATA|SEC_FILE_WRITE_ATTRIBUTE|SEC_FILE_WRITE_EA|SEC_FILE_APPEND_DATA )
 #define SEC_RIGHTS_FILE_EXECUTE        ( SEC_STD_SYNCHRONIZE|SEC_STD_READ_CONTROL|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_EXECUTE )
@@ -74,6 +75,7 @@
 #define SID_CREATOR_OWNER_DOMAIN       ( "S-1-3" )
 #define SID_CREATOR_OWNER      ( "S-1-3-0" )
 #define SID_CREATOR_GROUP      ( "S-1-3-1" )
+#define SID_OWNER_RIGHTS       ( "S-1-3-4" )
 #define NAME_NT_AUTHORITY      ( "NT AUTHORITY" )
 #define SID_NT_AUTHORITY       ( "S-1-5" )
 #define SID_NT_DIALUP  ( "S-1-5-1" )
@@ -90,9 +92,14 @@
 #define SID_NT_TERMINAL_SERVER_USERS   ( "S-1-5-13" )
 #define SID_NT_REMOTE_INTERACTIVE      ( "S-1-5-14" )
 #define SID_NT_THIS_ORGANISATION       ( "S-1-5-15" )
+#define SID_NT_IUSR    ( "S-1-5-17" )
 #define SID_NT_SYSTEM  ( "S-1-5-18" )
 #define SID_NT_LOCAL_SERVICE   ( "S-1-5-19" )
 #define SID_NT_NETWORK_SERVICE ( "S-1-5-20" )
+#define SID_NT_DIGEST_AUTHENTICATION   ( "S-1-5-64-21" )
+#define SID_NT_NTLM_AUTHENTICATION     ( "S-1-5-64-10" )
+#define SID_NT_SCHANNEL_AUTHENTICATION ( "S-1-5-64-14" )
+#define SID_NT_OTHER_ORGANISATION      ( "S-1-5-1000" )
 #define NAME_BUILTIN   ( "BUILTIN" )
 #define SID_BUILTIN    ( "S-1-5-32" )
 #define SID_BUILTIN_ADMINISTRATORS     ( "S-1-5-32-544" )
@@ -324,4 +331,11 @@ struct security_token {
 #define SECINFO_PROTECTED_SACL ( 0x40000000 )
 #define SECINFO_PROTECTED_DACL ( 0x80000000 )
 
+/* bitmap kerb_EncTypes */
+#define KERB_ENCTYPE_DES_CBC_CRC ( 0x00000001 )
+#define KERB_ENCTYPE_DES_CBC_MD5 ( 0x00000002 )
+#define KERB_ENCTYPE_RC4_HMAC_MD5 ( 0x00000004 )
+#define KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96 ( 0x00000008 )
+#define KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96 ( 0x00000010 )
+
 #endif /* _HEADER_security */