idl: Update IDL for eventlog, misc, netlogon and security from Samba 4.

diff --git a/source/librpc/gen_ndr/ndr_netlogon.c b/source/librpc/gen_ndr/ndr_netlogon.c
index 081c87fb12c8cb52d7dbf23931f41042be83bb72..0512f4db6534f55a5f44c95708556323f85776ca 100644 (file)
--- a/source/librpc/gen_ndr/ndr_netlogon.c
+++ b/source/librpc/gen_ndr/ndr_netlogon.c
@@ -2042,10 +2042,10 @@ static enum ndr_err_code ndr_push_netr_PasswordHistory(struct ndr_push *ndr, int
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->nt_length));
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->nt_size));
+               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->nt_length));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->nt_flags));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm_length));
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm_size));
+               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm_length));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->lm_flags));
                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->nt_history, r->nt_length));
                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->lm_history, r->lm_length));
@@ -2080,10 +2080,10 @@ _PUBLIC_ void ndr_print_netr_PasswordHistory(struct ndr_print *ndr, const char *
        ndr_print_struct(ndr, name, "netr_PasswordHistory");
        ndr->depth++;
        ndr_print_uint16(ndr, "nt_length", r->nt_length);
-       ndr_print_uint16(ndr, "nt_size", r->nt_size);
+       ndr_print_uint16(ndr, "nt_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->nt_length:r->nt_size);
        ndr_print_uint32(ndr, "nt_flags", r->nt_flags);
        ndr_print_uint16(ndr, "lm_length", r->lm_length);
-       ndr_print_uint16(ndr, "lm_size", r->lm_size);
+       ndr_print_uint16(ndr, "lm_size", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->lm_length:r->lm_size);
        ndr_print_uint32(ndr, "lm_flags", r->lm_flags);
        ndr_print_array_uint8(ndr, "nt_history", r->nt_history, r->nt_length);
        ndr_print_array_uint8(ndr, "lm_history", r->lm_history, r->lm_length);

diff --git a/source/librpc/gen_ndr/ndr_xattr.c b/source/librpc/gen_ndr/ndr_xattr.c
index 29a31a12b2c6a322c89907a0c89e54d671f29293..425ad814bf5c1adb8854824fae17d3d4882450a7 100644 (file)
--- a/source/librpc/gen_ndr/ndr_xattr.c
+++ b/source/librpc/gen_ndr/ndr_xattr.c
@@ -100,3 +100,4 @@ _PUBLIC_ void ndr_print_tdb_xattrs(struct ndr_print *ndr, const char *name, cons
        ndr->depth--;
        ndr->depth--;
 }
+

diff --git a/source/librpc/gen_ndr/netlogon.h b/source/librpc/gen_ndr/netlogon.h
index e33818257d4a7a80a2f3acf23a5865e9148f07e1..4b97470b6a54d98c165d7e829032d0c19ec84740 100644 (file)
--- a/source/librpc/gen_ndr/netlogon.h
+++ b/source/librpc/gen_ndr/netlogon.h
@@ -215,10 +215,10 @@ struct netr_USER_KEY16 {
 
 struct netr_PasswordHistory {
        uint16_t nt_length;
-       uint16_t nt_size;
+       uint16_t nt_size;/* [value(nt_length)] */
        uint32_t nt_flags;
        uint16_t lm_length;
-       uint16_t lm_size;
+       uint16_t lm_size;/* [value(lm_length)] */
        uint32_t lm_flags;
        uint8_t *nt_history;
        uint8_t *lm_history;

diff --git a/source/librpc/idl/eventlog.idl b/source/librpc/idl/eventlog.idl
index 7c57044d874941f8fada15c29d5b47d30b612b7c..3defd99400bcba78d58ef4658ac197217d91bc49 100644 (file)
--- a/source/librpc/idl/eventlog.idl
+++ b/source/librpc/idl/eventlog.idl
@@ -3,6 +3,7 @@
 /*
   eventlog interface definition
 */
+
 import "lsa.idl", "security.idl";
 
 [ uuid("82273fdc-e32a-18c3-3f78-827929dc23ea"),

diff --git a/source/librpc/idl/misc.idl b/source/librpc/idl/misc.idl
index ae098d09acaf5125eee48c905c3a4b52bb61b98b..00f9fb6bed1bef525fe473fdfb189e922d972f0e 100644 (file)
--- a/source/librpc/idl/misc.idl
+++ b/source/librpc/idl/misc.idl
@@ -45,7 +45,8 @@ interface misc
        typedef [public,v1_enum] enum {
                SAMR_REJECT_OTHER      = 0,
                SAMR_REJECT_TOO_SHORT  = 1,
-               SAMR_REJECT_COMPLEXITY = 2
+               SAMR_REJECT_IN_HISTORY = 2,
+               SAMR_REJECT_COMPLEXITY = 5
        } samr_RejectReason;
 
 

diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 72feb2f9ed50f56901515e37d2e579b1507ccd1d..395976c0740741b01e510769a691fbf1b11f18ca 100644 (file)
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -330,10 +330,10 @@ interface netlogon
 
        typedef struct {
                uint16 nt_length;
-               uint16 nt_size;
+               [value(nt_length)] uint16 nt_size;
                uint32 nt_flags;
                uint16 lm_length;
-               uint16 lm_size;
+               [value(lm_length)] uint16 lm_size;
                uint32 lm_flags;
                uint8 nt_history[nt_length];
                uint8 lm_history[lm_length];

diff --git a/source/librpc/idl/security.idl b/source/librpc/idl/security.idl
index 8a0d36a696f8d3980949235054937e9ae4ba6211..929c6cc18acb7965f38cef6ed749e3dd4a1b1167 100644 (file)
--- a/source/librpc/idl/security.idl
+++ b/source/librpc/idl/security.idl
@@ -121,6 +121,8 @@ interface security
        const string SID_NULL = "S-1-0-0";
 
        /* the world domain */
+       const string NAME_WORLD       = "WORLD";
+
        const string SID_WORLD_DOMAIN = "S-1-1";
        const string SID_WORLD        = "S-1-1-0";
 
@@ -130,6 +132,8 @@ interface security
        const string SID_CREATOR_GROUP        = "S-1-3-1";
 
        /* SECURITY_NT_AUTHORITY */
+       const string NAME_NT_AUTHORITY            = "NT AUTHORITY";
+
        const string SID_NT_AUTHORITY             = "S-1-5";
        const string SID_NT_DIALUP                = "S-1-5-1";
        const string SID_NT_NETWORK               = "S-1-5-2";
@@ -150,6 +154,8 @@ interface security
        const string SID_NT_NETWORK_SERVICE       = "S-1-5-20";
 
        /* SECURITY_BUILTIN_DOMAIN_RID */
+       const string NAME_BUILTIN                  = "BUILTIN";
+
        const string SID_BUILTIN                   = "S-1-5-32";
        const string SID_BUILTIN_ADMINISTRATORS    = "S-1-5-32-544";
        const string SID_BUILTIN_USERS             = "S-1-5-32-545";
@@ -169,6 +175,7 @@ interface security
        const int DOMAIN_RID_GUEST                 = 501;
        const int DOMAIN_RID_ADMINS                = 512;
        const int DOMAIN_RID_USERS                 = 513;
+       const int DOMAIN_RID_DOMAIN_MEMBERS        = 515;
        const int DOMAIN_RID_DCS                   = 516;
        const int DOMAIN_RID_CERT_ADMINS           = 517;
        const int DOMAIN_RID_SCHEMA_ADMINS         = 518;
@@ -239,7 +246,7 @@ interface security
                SEC_ACE_TYPE_SYSTEM_ALARM_OBJECT        = 8
        } security_ace_type;
 
-       typedef bitmap {
+       typedef [bitmap32bit] bitmap {
                SEC_ACE_OBJECT_TYPE_PRESENT             = 0x00000001,
                SEC_ACE_INHERITED_OBJECT_TYPE_PRESENT   = 0x00000002
        } security_ace_object_flags;