Merge branch 'master' of /home/tridge/samba/git/combined
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Sep 2009 22:24:20 +0000 (15:24 -0700)
151 files changed:
client/cifs.upcall.c
lib/replace/replace.h
lib/util/asn1.c
lib/util/asn1.h
libcli/auth/smbencrypt.c
libcli/auth/spnego.h [moved from source4/auth/gensec/spnego.h with 84% similarity]
libcli/auth/spnego_parse.c [moved from source4/auth/gensec/spnego_parse.c with 94% similarity]
libcli/auth/spnego_proto.h [new file with mode: 0644]
libcli/security/security_descriptor.c
libcli/security/security_descriptor.h
libcli/util/doserr.c
libcli/util/ntstatus.h
libcli/util/werror.h
libds/common/flag_mapping.c
libds/common/flags.h
librpc/gen_ndr/cli_drsuapi.c
librpc/gen_ndr/cli_drsuapi.h
librpc/gen_ndr/dcerpc.h
librpc/gen_ndr/dfs.h
librpc/gen_ndr/drsblobs.h
librpc/gen_ndr/drsuapi.h
librpc/gen_ndr/dssetup.h
librpc/gen_ndr/echo.h
librpc/gen_ndr/epmapper.h
librpc/gen_ndr/eventlog.h
librpc/gen_ndr/initshutdown.h
librpc/gen_ndr/krb5pac.h
librpc/gen_ndr/lsa.h
librpc/gen_ndr/misc.h
librpc/gen_ndr/nbt.h
librpc/gen_ndr/ndr_dcerpc.c
librpc/gen_ndr/ndr_dfs.c
librpc/gen_ndr/ndr_drsblobs.c
librpc/gen_ndr/ndr_drsuapi.c
librpc/gen_ndr/ndr_drsuapi.h
librpc/gen_ndr/ndr_dssetup.c
librpc/gen_ndr/ndr_echo.c
librpc/gen_ndr/ndr_epmapper.c
librpc/gen_ndr/ndr_eventlog.c
librpc/gen_ndr/ndr_krb5pac.c
librpc/gen_ndr/ndr_lsa.c
librpc/gen_ndr/ndr_misc.c
librpc/gen_ndr/ndr_named_pipe_auth.c
librpc/gen_ndr/ndr_nbt.c
librpc/gen_ndr/ndr_netlogon.c
librpc/gen_ndr/ndr_ntlmssp.c
librpc/gen_ndr/ndr_ntsvcs.c
librpc/gen_ndr/ndr_samr.c
librpc/gen_ndr/ndr_schannel.c
librpc/gen_ndr/ndr_security.c
librpc/gen_ndr/ndr_security.h
librpc/gen_ndr/ndr_spoolss.c
librpc/gen_ndr/ndr_srvsvc.c
librpc/gen_ndr/ndr_svcctl.c
librpc/gen_ndr/ndr_winreg.c
librpc/gen_ndr/ndr_wkssvc.c
librpc/gen_ndr/ndr_xattr.c
librpc/gen_ndr/netlogon.h
librpc/gen_ndr/ntlmssp.h
librpc/gen_ndr/samr.h
librpc/gen_ndr/schannel.h
librpc/gen_ndr/security.h
librpc/gen_ndr/spoolss.h
librpc/gen_ndr/srvsvc.h
librpc/gen_ndr/svcctl.h
librpc/gen_ndr/winreg.h
librpc/gen_ndr/wkssvc.h
librpc/idl/drsuapi.idl
librpc/idl/security.idl
librpc/ndr/libndr.h
librpc/ndr/ndr.c
librpc/ndr/ndr_basic.c
librpc/ndr/ndr_sec_helper.c
librpc/rpc/binding.c
librpc/tools/ndrdump.c
nsswitch/pam_winbind.c
pidl/lib/Parse/Pidl/NDR.pm
pidl/lib/Parse/Pidl/Samba4/Header.pm
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
source3/Makefile.in
source3/configure.in
source3/include/ads.h
source3/include/includes.h
source3/include/proto.h
source3/include/spnego.h [deleted file]
source3/libads/sasl.c
source3/libnet/libnet_join.c
source3/librpc/gen_ndr/messaging.h
source3/libsmb/cliconnect.c
source3/libsmb/clifsinfo.c
source3/libsmb/clispnego.c
source3/libsmb/spnego.c [deleted file]
source3/modules/vfs_gpfs.c
source3/modules/vfs_tsmsm.c
source3/rpc_client/cli_pipe.c
source3/rpc_server/srv_netlog_nt.c
source3/rpc_server/srv_pipe.c
source3/rpc_server/srv_pipe_hnd.c
source3/rpcclient/cmd_netlogon.c
source3/smbd/globals.c
source3/smbd/negprot.c
source3/smbd/nttrans.c
source3/smbd/seal.c
source3/smbd/sesssetup.c
source3/smbd/smb2_create.c
source3/smbd/smb2_sesssetup.c
source3/smbd/trans2.c
source3/torture/torture.c
source3/utils/ntlm_auth.c
source3/winbindd/winbindd_ads.c
source3/winbindd/winbindd_proto.h
source3/winbindd/winbindd_remove_mapping.c
source3/winbindd/winbindd_rpc.c
source3/winbindd/winbindd_set_hwm.c
source3/winbindd/winbindd_set_mapping.c
source4/auth/gensec/config.mk
source4/auth/gensec/spnego.c
source4/auth/sam.c
source4/dsdb/samdb/ldb_modules/config.mk
source4/dsdb/samdb/ldb_modules/descriptor.c [new file with mode: 0644]
source4/dsdb/samdb/ldb_modules/objectclass.c
source4/dsdb/samdb/ldb_modules/password_hash.c
source4/kdc/kpasswdd.c
source4/lib/ldb/tests/python/sec_descriptor.py [new file with mode: 0644]
source4/libcli/security/config.mk
source4/libcli/security/create_descriptor.c [new file with mode: 0644]
source4/libnet/libnet_become_dc.c
source4/librpc/rpc/dcerpc.c
source4/librpc/rpc/dcerpc.h
source4/librpc/rpc/dcerpc_auth.c
source4/librpc/rpc/dcerpc_smb.c
source4/librpc/rpc/dcerpc_util.c
source4/rpc_server/dcerpc_server.c
source4/rpc_server/drsuapi/dcesrv_drsuapi.c
source4/scripting/python/pyglue.c
source4/scripting/python/samba/__init__.py
source4/scripting/python/samba/provision.py
source4/selftest/knownfail
source4/selftest/tests.sh
source4/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt [moved from source4/setup/display-specifiers/DisplaySpecifiers-win2k0.txt with 98% similarity]
source4/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
source4/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
source4/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
source4/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
source4/setup/provision.ldif
source4/setup/provision_basedn_modify.ldif
source4/setup/provision_configuration.ldif
source4/setup/provision_configuration_basedn_modify.ldif
source4/setup/provision_group_policy.ldif
source4/setup/provision_schema_basedn_modify.ldif
source4/torture/util_smb.c

index 71e60c6d246072a31f587c52e56c8256b7939814..bf6a861544c80b01c8c1ac904bfe54ff3f3d70c2 100644 (file)
@@ -26,6 +26,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
 */
 
 #include "includes.h"
+#include "../libcli/auth/spnego.h"
 #include <keyutils.h>
 #include <getopt.h>
 
index 2db6aa1226cbe796666371151dc89d7656bac78e..6424d10c0f9b9ed6f53f1740be6c97cf020e747b 100644 (file)
@@ -704,4 +704,23 @@ char *ufc_crypt(const char *key, const char *salt);
 #endif
 #endif
 
+/* these macros gain us a few percent of speed on gcc */
+#if (__GNUC__ >= 3)
+/* the strange !! is to ensure that __builtin_expect() takes either 0 or 1
+   as its first argument */
+#ifndef likely
+#define likely(x)   __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+#define unlikely(x) __builtin_expect(!!(x), 0)
+#endif
+#else
+#ifndef likely
+#define likely(x) (x)
+#endif
+#ifndef unlikely
+#define unlikely(x) (x)
+#endif
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */
index 317ee1314c6095a7213d8e55c9633aa2798823c3..70c2c57450cc1de869fab961de8ea55911e8c9e4 100644 (file)
@@ -205,6 +205,15 @@ bool asn1_write_Integer(struct asn1_data *data, int i)
        return asn1_pop_tag(data);
 }
 
+/* write a BIT STRING */
+bool asn1_write_BitString(struct asn1_data *data, const void *p, size_t length, uint8_t padding)
+{
+       if (!asn1_push_tag(data, ASN1_BIT_STRING)) return false;
+       if (!asn1_write_uint8(data, padding)) return false;
+       if (!asn1_write(data, p, length)) return false;
+       return asn1_pop_tag(data);
+}
+
 bool ber_write_OID_String(DATA_BLOB *blob, const char *OID)
 {
        uint_t v, v2;
@@ -727,6 +736,39 @@ bool asn1_read_Integer(struct asn1_data *data, int *i)
        return asn1_end_tag(data);      
 }
 
+/* read a BIT STRING */
+bool asn1_read_BitString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob, uint8_t *padding)
+{
+       int len;
+       ZERO_STRUCTP(blob);
+       if (!asn1_start_tag(data, ASN1_BIT_STRING)) return false;
+       len = asn1_tag_remaining(data);
+       if (len < 0) {
+               data->has_error = true;
+               return false;
+       }
+       if (!asn1_read_uint8(data, padding)) return false;
+
+       *blob = data_blob_talloc(mem_ctx, NULL, len);
+       if (!blob->data) {
+               data->has_error = true;
+               return false;
+       }
+       if (asn1_read(data, blob->data, len - 1)) {
+               blob->length--;
+               blob->data[len] = 0;
+               asn1_end_tag(data);
+       }
+
+       if (data->has_error) {
+               data_blob_free(blob);
+               *blob = data_blob_null;
+               *padding = 0;
+               return false;
+       }
+       return true;
+}
+
 /* read an integer */
 bool asn1_read_enumerated(struct asn1_data *data, int *v)
 {
index 4c6624056e0c6973f4945ec4055d54b63f4a3253..9abae50d64ef6c1e1c905076d647eaccaa4287b7 100644 (file)
@@ -60,6 +60,7 @@ bool asn1_push_tag(struct asn1_data *data, uint8_t tag);
 bool asn1_pop_tag(struct asn1_data *data);
 bool asn1_write_implicit_Integer(struct asn1_data *data, int i);
 bool asn1_write_Integer(struct asn1_data *data, int i);
+bool asn1_write_BitString(struct asn1_data *data, const void *p, size_t length, uint8_t padding);
 bool ber_write_OID_String(DATA_BLOB *blob, const char *OID);
 bool asn1_write_OID(struct asn1_data *data, const char *OID);
 bool asn1_write_OctetString(struct asn1_data *data, const void *p, size_t length);
@@ -90,6 +91,7 @@ bool asn1_read_OctetString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLO
 bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
 bool asn1_read_implicit_Integer(struct asn1_data *data, int *i);
 bool asn1_read_Integer(struct asn1_data *data, int *i);
+bool asn1_read_BitString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob, uint8_t *padding);
 bool asn1_read_enumerated(struct asn1_data *data, int *v);
 bool asn1_check_enumerated(struct asn1_data *data, int v);
 bool asn1_write_enumerated(struct asn1_data *data, uint8_t v);
index eaa1b6f050791298e720854a036396b24999ef0c..a3182cd806bd510de891c86a306e21628fdc89fd 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
    SMB parameters and setup
    Copyright (C) Andrew Tridgell 1992-1998
@@ -6,17 +6,17 @@
    Copyright (C) Jeremy Allison 1995-2000.
    Copyright (C) Luke Kennethc Casson Leighton 1996-2000.
    Copyright (C) Andrew Bartlett <abartlet@samba.org> 2002-2003
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -47,8 +47,8 @@ void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[2
 
 /*
    This implements the X/Open SMB password encryption
-   It takes a password ('unix' string), a 8 byte "crypt key" 
-   and puts 24 bytes of encrypted password into p24 
+   It takes a password ('unix' string), a 8 byte "crypt key"
+   and puts 24 bytes of encrypted password into p24
 
    Returns False if password must have been truncated to create LM hash
 */
@@ -58,7 +58,7 @@ bool SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24])
        bool ret;
        uint8_t lm_hash[16];
 
-       ret = E_deshash(passwd, lm_hash); 
+       ret = E_deshash(passwd, lm_hash);
        SMBencrypt_hash(lm_hash, c8, p24);
        return ret;
 }
@@ -68,7 +68,7 @@ bool SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24])
  * @param passwd password in 'unix' charset.
  * @param p16 return password hashed with md4, caller allocated 16 byte buffer
  */
+
 bool E_md4hash(const char *passwd, uint8_t p16[16])
 {
        size_t len;
@@ -82,7 +82,7 @@ bool E_md4hash(const char *passwd, uint8_t p16[16])
                mdfour(p16, (const uint8_t *)passwd, strlen(passwd));
                return false;
        }
-       
+
        len -= 2;
        mdfour(p16, (const uint8_t *)wpwd, len);
 
@@ -101,7 +101,7 @@ void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_ou
 {
        struct MD5Context tctx;
        uint8_t array[32];
-       
+
        memset(hash_out, '\0', 16);
        memcpy(array, salt, 16);
        memcpy(&array[16], nthash, 16);
@@ -117,7 +117,7 @@ void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_ou
  * @return false if password was > 14 characters, and therefore may be incorrect, otherwise true
  * @note p16 is filled in regardless
  */
+
 bool E_deshash(const char *passwd, uint8_t p16[16])
 {
        bool ret = true;
@@ -134,19 +134,19 @@ bool E_deshash(const char *passwd, uint8_t p16[16])
                ret = false;
        }
 
-       ZERO_STRUCT(dospwd);    
+       ZERO_STRUCT(dospwd);
 
        return ret;
 }
 
 /**
- * Creates the MD4 and DES (LM) Hash of the users password.  
+ * Creates the MD4 and DES (LM) Hash of the users password.
  * MD4 is of the NT Unicode, DES is of the DOS UPPERCASE password.
  * @param passwd password in 'unix' charset.
  * @param nt_p16 return password hashed with md4, caller allocated 16 byte buffer
  * @param p16 return password hashed with des, caller allocated 16 byte buffer
  */
+
 /* Does both the NT and LM owfs of a user's password */
 void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16])
 {
@@ -176,13 +176,13 @@ bool ntv2_owf_gen(const uint8_t owf[16],
                  uint8_t kr_buf[16])
 {
        smb_ucs2_t *user;
-       smb_ucs2_t *domain;     
+       smb_ucs2_t *domain;
        size_t user_byte_len;
        size_t domain_byte_len;
        bool ret;
 
        HMACMD5Context ctx;
-       TALLOC_CTX *mem_ctx = talloc_init("ntv2_owf_gen for %s\\%s", domain_in, user_in); 
+       TALLOC_CTX *mem_ctx = talloc_init("ntv2_owf_gen for %s\\%s", domain_in, user_in);
 
        if (!mem_ctx) {
                return false;
@@ -230,7 +230,7 @@ bool ntv2_owf_gen(const uint8_t owf[16],
        /* We don't want null termination */
        user_byte_len = user_byte_len - 2;
        domain_byte_len = domain_byte_len - 2;
-       
+
        hmac_md5_init_limK_to_64(owf, 16, &ctx);
        hmac_md5_update((uint8_t *)user, user_byte_len, &ctx);
        hmac_md5_update((uint8_t *)domain, domain_byte_len, &ctx);
@@ -254,17 +254,17 @@ void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24])
        uint8_t p21[21];
 
        ZERO_STRUCT(p21);
-       memcpy(p21, passwd, 16);    
+
+       memcpy(p21, passwd, 16);
        E_P24(p21, c8, p24);
 }
 
 /* Does the des encryption. */
+
 void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24)
 {
        uint8_t p21[21];
+
        memset(p21,'\0',21);
        memcpy(p21, nt_hash, 16);
        SMBOWFencrypt(p21, c8, p24);
@@ -282,7 +282,7 @@ void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24)
 void SMBNTencrypt(const char *passwd, uint8_t *c8, uint8_t *p24)
 {
        uint8_t nt_hash[16];
-       E_md4hash(passwd, nt_hash);    
+       E_md4hash(passwd, nt_hash);
        SMBNTencrypt_hash(nt_hash, c8, p24);
 }
 
@@ -312,7 +312,7 @@ void SMBsesskeygen_ntv2(const uint8_t kr[16],
                        const uint8_t * nt_resp, uint8_t sess_key[16])
 {
        /* a very nice, 128 bit, variable session key */
-       
+
        HMACMD5Context ctx;
 
        hmac_md5_init_limK_to_64(kr, 16, &ctx);
@@ -327,9 +327,9 @@ void SMBsesskeygen_ntv2(const uint8_t kr[16],
 
 void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16])
 {
-       /* yes, this session key does not change - yes, this 
+       /* yes, this session key does not change - yes, this
           is a problem - but it is 128 bits */
-       
+
        mdfour((uint8_t *)sess_key, kr, 16);
 
 #ifdef DEBUG_PASSWORD
@@ -339,15 +339,15 @@ void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16])
 }
 
 void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
-                              const uint8_t lm_resp[24], /* only uses 8 */ 
+                              const uint8_t lm_resp[24], /* only uses 8 */
                               uint8_t sess_key[16])
 {
        /* Calculate the LM session key (effective length 40 bits,
           but changes with each session) */
        uint8_t p24[24];
        uint8_t partial_lm_hash[14];
-       memcpy(partial_lm_hash, lm_hash, 8);    
+
+       memcpy(partial_lm_hash, lm_hash, 8);
        memset(partial_lm_hash + 8, 0xbd, 6);
 
        des_crypt56(p24,   lm_resp, partial_lm_hash,     1);
@@ -361,21 +361,21 @@ void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
 #endif
 }
 
-DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx, 
-                                    const char *hostname, 
+DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx,
+                                    const char *hostname,
                                     const char *domain)
 {
        DATA_BLOB names_blob = data_blob_talloc(mem_ctx, NULL, 0);
-       
-       msrpc_gen(mem_ctx, &names_blob, 
-                 "aaa", 
+
+       msrpc_gen(mem_ctx, &names_blob,
+                 "aaa",
                  MsvAvNbDomainName, domain,
                  MsvAvNbComputerName, hostname,
                  MsvAvEOL, "");
        return names_blob;
 }
 
-static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLOB *names_blob) 
+static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLOB *names_blob)
 {
        uint8_t client_chal[8];
        DATA_BLOB response = data_blob(NULL, 0);
@@ -390,7 +390,7 @@ static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLO
 
        /* See http://www.ubiqx.org/cifs/SMB.html#SMB.8.5 */
 
-       msrpc_gen(mem_ctx, &response, "ddbbdb", 
+       msrpc_gen(mem_ctx, &response, "ddbbdb",
                  0x00000101,     /* Header  */
                  0,              /* 'Reserved'  */
                  long_date, 8,   /* Timestamp */
@@ -401,7 +401,7 @@ static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLO
        return response;
 }
 
-static DATA_BLOB NTLMv2_generate_response(TALLOC_CTX *out_mem_ctx, 
+static DATA_BLOB NTLMv2_generate_response(TALLOC_CTX *out_mem_ctx,
                                          const uint8_t ntlm_v2_hash[16],
                                          const DATA_BLOB *server_chal,
                                          const DATA_BLOB *names_blob)
@@ -409,14 +409,14 @@ static DATA_BLOB NTLMv2_generate_response(TALLOC_CTX *out_mem_ctx,
        uint8_t ntlmv2_response[16];
        DATA_BLOB ntlmv2_client_data;
        DATA_BLOB final_response;
-       
-       TALLOC_CTX *mem_ctx = talloc_named(out_mem_ctx, 0, 
+
+       TALLOC_CTX *mem_ctx = talloc_named(out_mem_ctx, 0,
                                           "NTLMv2_generate_response internal context");
 
        if (!mem_ctx) {
                return data_blob(NULL, 0);
        }
-       
+
        /* NTLMv2 */
        /* generate some data to pass into the response function - including
           the hostname and domain name of the server */
@@ -424,12 +424,12 @@ static DATA_BLOB NTLMv2_generate_response(TALLOC_CTX *out_mem_ctx,
 
        /* Given that data, and the challenge from the server, generate a response */
        SMBOWFencrypt_ntv2(ntlm_v2_hash, server_chal, &ntlmv2_client_data, ntlmv2_response);
-       
+
        final_response = data_blob_talloc(out_mem_ctx, NULL, sizeof(ntlmv2_response) + ntlmv2_client_data.length);
 
        memcpy(final_response.data, ntlmv2_response, sizeof(ntlmv2_response));
 
-       memcpy(final_response.data+sizeof(ntlmv2_response), 
+       memcpy(final_response.data+sizeof(ntlmv2_response),
               ntlmv2_client_data.data, ntlmv2_client_data.length);
 
        talloc_free(mem_ctx);
@@ -437,25 +437,25 @@ static DATA_BLOB NTLMv2_generate_response(TALLOC_CTX *out_mem_ctx,
        return final_response;
 }
 
-static DATA_BLOB LMv2_generate_response(TALLOC_CTX *mem_ctx, 
+static DATA_BLOB LMv2_generate_response(TALLOC_CTX *mem_ctx,
                                        const uint8_t ntlm_v2_hash[16],
                                        const DATA_BLOB *server_chal)
 {
        uint8_t lmv2_response[16];
        DATA_BLOB lmv2_client_data = data_blob_talloc(mem_ctx, NULL, 8);
        DATA_BLOB final_response = data_blob_talloc(mem_ctx, NULL,24);
-       
+
        /* LMv2 */
        /* client-supplied random data */
-       generate_random_buffer(lmv2_client_data.data, lmv2_client_data.length); 
+       generate_random_buffer(lmv2_client_data.data, lmv2_client_data.length);
 
        /* Given that data, and the challenge from the server, generate a response */
        SMBOWFencrypt_ntv2(ntlm_v2_hash, server_chal, &lmv2_client_data, lmv2_response);
        memcpy(final_response.data, lmv2_response, sizeof(lmv2_response));
 
-       /* after the first 16 bytes is the random data we generated above, 
+       /* after the first 16 bytes is the random data we generated above,
           so the server can verify us with it */
-       memcpy(final_response.data+sizeof(lmv2_response), 
+       memcpy(final_response.data+sizeof(lmv2_response),
               lmv2_client_data.data, lmv2_client_data.length);
 
        data_blob_free(&lmv2_client_data);
@@ -463,12 +463,12 @@ static DATA_BLOB LMv2_generate_response(TALLOC_CTX *mem_ctx,
        return final_response;
 }
 
-bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx, 
+bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx,
                           const char *user, const char *domain, const uint8_t nt_hash[16],
-                          const DATA_BLOB *server_chal, 
+                          const DATA_BLOB *server_chal,
                           const DATA_BLOB *names_blob,
-                          DATA_BLOB *lm_response, DATA_BLOB *nt_response, 
-                          DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) 
+                          DATA_BLOB *lm_response, DATA_BLOB *nt_response,
+                          DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key)
 {
        uint8_t ntlm_v2_hash[16];
 
@@ -479,49 +479,49 @@ bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx,
        if (!ntv2_owf_gen(nt_hash, user, domain, true, ntlm_v2_hash)) {
                return false;
        }
-       
+
        if (nt_response) {
-               *nt_response = NTLMv2_generate_response(mem_ctx, 
+               *nt_response = NTLMv2_generate_response(mem_ctx,
                                                        ntlm_v2_hash, server_chal,
-                                                       names_blob); 
+                                                       names_blob);
                if (user_session_key) {
                        *user_session_key = data_blob_talloc(mem_ctx, NULL, 16);
-                       
+
                        /* The NTLMv2 calculations also provide a session key, for signing etc later */
                        /* use only the first 16 bytes of nt_response for session key */
                        SMBsesskeygen_ntv2(ntlm_v2_hash, nt_response->data, user_session_key->data);
                }
        }
-       
+
        /* LMv2 */
-       
+
        if (lm_response) {
-               *lm_response = LMv2_generate_response(mem_ctx, 
+               *lm_response = LMv2_generate_response(mem_ctx,
                                                      ntlm_v2_hash, server_chal);
                if (lm_session_key) {
                        *lm_session_key = data_blob_talloc(mem_ctx, NULL, 16);
-                       
+
                        /* The NTLMv2 calculations also provide a session key, for signing etc later */
                        /* use only the first 16 bytes of lm_response for session key */
                        SMBsesskeygen_ntv2(ntlm_v2_hash, lm_response->data, lm_session_key->data);
                }
        }
-       
+
        return true;
 }
 
-bool SMBNTLMv2encrypt(TALLOC_CTX *mem_ctx, 
-                     const char *user, const char *domain, 
-                     const char *password, 
-                     const DATA_BLOB *server_chal, 
+bool SMBNTLMv2encrypt(TALLOC_CTX *mem_ctx,
+                     const char *user, const char *domain,
+                     const char *password,
+                     const DATA_BLOB *server_chal,
                      const DATA_BLOB *names_blob,
-                     DATA_BLOB *lm_response, DATA_BLOB *nt_response, 
-                     DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) 
+                     DATA_BLOB *lm_response, DATA_BLOB *nt_response,
+                     DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key)
 {
        uint8_t nt_hash[16];
        E_md4hash(password, nt_hash);
 
-       return SMBNTLMv2encrypt_hash(mem_ctx, 
+       return SMBNTLMv2encrypt_hash(mem_ctx,
                                     user, domain, nt_hash, server_chal, names_blob,
                                     lm_response, nt_response, lm_session_key, user_session_key);
 }
@@ -539,14 +539,14 @@ bool encode_pw_buffer(uint8_t buffer[516], const char *password, int string_flag
        string_flags |= STR_NOALIGN;
 
        new_pw_len = push_string(new_pw,
-                                password, 
+                                password,
                                 sizeof(new_pw), string_flags);
-       
+
        memcpy(&buffer[512 - new_pw_len], new_pw, new_pw_len);
 
        generate_random_buffer(buffer, 512 - new_pw_len);
 
-       /* 
+       /*
         * The length of the new password is in the last 4 bytes of
         * the data buffer.
         */
@@ -596,7 +596,7 @@ bool decode_pw_buffer(TALLOC_CTX *ctx,
        }
 
        /* decode into the return buffer. */
-       if (!convert_string_talloc(ctx, string_charset, CH_UNIX, 
+       if (!convert_string_talloc(ctx, string_charset, CH_UNIX,
                                   &in_buffer[512 - byte_len],
                                   byte_len,
                                   (void *)pp_new_pwrd,
@@ -649,7 +649,7 @@ bool set_pw_in_buffer(uint8_t buffer[516], DATA_BLOB *password)
 
        generate_random_buffer(buffer, 512 - password->length);
 
-       /* 
+       /*
         * The length of the new password is in the last 4 bytes of
         * the data buffer.
         */
@@ -661,7 +661,7 @@ bool set_pw_in_buffer(uint8_t buffer[516], DATA_BLOB *password)
  decode a password buffer
  *new_pw_size is the length in bytes of the extracted unicode password
 ************************************************************/
-bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx, 
+bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx,
                            uint8_t in_buffer[516], DATA_BLOB *new_pass)
 {
        int byte_len=0;
similarity index 84%
rename from source4/auth/gensec/spnego.h
rename to libcli/auth/spnego.h
index 24e80ecb0bc7aa5bc23293652ea0382f11ea4f31..4b60f22d32d09291c00f54559659caf81e901202 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    RFC2478 Compliant SPNEGO implementation
@@ -9,17 +9,22 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define OID_SPNEGO "1.3.6.1.5.5.2"
+#define OID_NTLMSSP "1.3.6.1.4.1.311.2.2.10"
+#define OID_KERBEROS5_OLD "1.2.840.48018.1.2.2"
+#define OID_KERBEROS5 "1.2.840.113554.1.2.2"
+
 #define SPNEGO_DELEG_FLAG    0x01
 #define SPNEGO_MUTUAL_FLAG   0x02
 #define SPNEGO_REPLAY_FLAG   0x04
@@ -27,7 +32,6 @@
 #define SPNEGO_ANON_FLAG     0x10
 #define SPNEGO_CONF_FLAG     0x20
 #define SPNEGO_INTEG_FLAG    0x40
-#define SPNEGO_REQ_FLAG      0x80
 
 enum spnego_negResult {
        SPNEGO_ACCEPT_COMPLETED = 0,
@@ -38,7 +42,8 @@ enum spnego_negResult {
 
 struct spnego_negTokenInit {
        const char **mechTypes;
-       int reqFlags;
+       DATA_BLOB reqFlags;
+       uint8_t reqFlagsPadding;
        DATA_BLOB mechToken;
        DATA_BLOB mechListMIC;
        char *targetPrincipal;
@@ -58,8 +63,8 @@ struct spnego_data {
 };
 
 enum spnego_message_type {
-       SPNEGO_NEG_TOKEN_INIT = 0, 
+       SPNEGO_NEG_TOKEN_INIT = 0,
        SPNEGO_NEG_TOKEN_TARG = 1,
 };
 
-#include "auth/gensec/spnego_proto.h"
+#include "../libcli/auth/spnego_proto.h"
similarity index 94%
rename from source4/auth/gensec/spnego_parse.c
rename to libcli/auth/spnego_parse.c
index a79f15b8eebeb6169899509686ffe55333295b6a..3f7047b0e0bdccd51f2eafd4d60bc8f15f694b34 100644 (file)
@@ -1,4 +1,4 @@
-/* 
+/*
    Unix SMB/CIFS implementation.
 
    RFC2478 Compliant SPNEGO implementation
@@ -9,20 +9,19 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "auth/gensec/spnego.h"
-#include "auth/gensec/gensec.h"
+#include "../libcli/auth/spnego.h"
 #include "../lib/util/asn1.h"
 
 static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
@@ -50,21 +49,21 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
                        token->mechTypes = talloc(NULL, const char *);
                        for (i = 0; !asn1->has_error &&
                                     0 < asn1_tag_remaining(asn1); i++) {
-                               token->mechTypes = talloc_realloc(NULL, 
-                                                                 token->mechTypes, 
+                               token->mechTypes = talloc_realloc(NULL,
+                                                                 token->mechTypes,
                                                                  const char *, i+2);
                                asn1_read_OID(asn1, token->mechTypes, token->mechTypes + i);
                        }
                        token->mechTypes[i] = NULL;
-                       
+
                        asn1_end_tag(asn1);
                        asn1_end_tag(asn1);
                        break;
                /* Read reqFlags */
                case ASN1_CONTEXT(1):
                        asn1_start_tag(asn1, ASN1_CONTEXT(1));
-                       asn1_read_Integer(asn1, &token->reqFlags);
-                       token->reqFlags |= SPNEGO_REQ_FLAG;
+                       asn1_read_BitString(asn1, mem_ctx, &token->reqFlags,
+                                           &token->reqFlagsPadding);
                        asn1_end_tag(asn1);
                        break;
                 /* Read mechToken */
@@ -83,7 +82,7 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
                                break;
                        }
                        if (type_peek == ASN1_OCTET_STRING) {
-                               asn1_read_OctetString(asn1, mem_ctx, 
+                               asn1_read_OctetString(asn1, mem_ctx,
                                                      &token->mechListMIC);
                        } else {
                                /* RFC 2478 says we have an Octet String here,
@@ -131,11 +130,11 @@ static bool write_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenIni
        }
 
        /* write reqFlags */
-       if (token->reqFlags & SPNEGO_REQ_FLAG) {
-               int flags = token->reqFlags & ~SPNEGO_REQ_FLAG;
-
+       if (token->reqFlags.length > 0) {
                asn1_push_tag(asn1, ASN1_CONTEXT(1));
-               asn1_write_Integer(asn1, flags);
+               asn1_write_BitString(asn1, token->reqFlags.data,
+                                    token->reqFlags.length,
+                                    token->reqFlagsPadding);
                asn1_pop_tag(asn1);
        }
 
@@ -165,7 +164,7 @@ static bool write_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenIni
                asn1_pop_tag(asn1);
                asn1_pop_tag(asn1);
                asn1_pop_tag(asn1);
-#endif         
+#endif
                asn1_pop_tag(asn1);
        }
 
@@ -175,7 +174,7 @@ static bool write_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenIni
        return !asn1->has_error;
 }
 
-static bool read_negTokenTarg(struct asn1_data *asn1, TALLOC_CTX *mem_ctx, 
+static bool read_negTokenTarg(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
                              struct spnego_negTokenTarg *token)
 {
        ZERO_STRUCTP(token);
@@ -287,7 +286,7 @@ ssize_t spnego_read_data(TALLOC_CTX *mem_ctx, DATA_BLOB data, struct spnego_data
                switch (context) {
                case ASN1_APPLICATION(0):
                        asn1_start_tag(asn1, ASN1_APPLICATION(0));
-                       asn1_check_OID(asn1, GENSEC_OID_SPNEGO);
+                       asn1_check_OID(asn1, OID_SPNEGO);
                        if (read_negTokenInit(asn1, mem_ctx, &token->negTokenInit)) {
                                token->type = SPNEGO_NEG_TOKEN_INIT;
                        }
@@ -322,7 +321,7 @@ ssize_t spnego_write_data(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct spnego_da
        switch (spnego->type) {
        case SPNEGO_NEG_TOKEN_INIT:
                asn1_push_tag(asn1, ASN1_APPLICATION(0));
-               asn1_write_OID(asn1, GENSEC_OID_SPNEGO);
+               asn1_write_OID(asn1, OID_SPNEGO);
                write_negTokenInit(asn1, &spnego->negTokenInit);
                asn1_pop_tag(asn1);
                break;
@@ -354,6 +353,7 @@ bool spnego_free_data(struct spnego_data *spnego)
                if (spnego->negTokenInit.mechTypes) {
                        talloc_free(spnego->negTokenInit.mechTypes);
                }
+               data_blob_free(&spnego->negTokenInit.reqFlags);
                data_blob_free(&spnego->negTokenInit.mechToken);
                data_blob_free(&spnego->negTokenInit.mechListMIC);
                talloc_free(spnego->negTokenInit.targetPrincipal);
diff --git a/libcli/auth/spnego_proto.h b/libcli/auth/spnego_proto.h
new file mode 100644 (file)
index 0000000..5fd5e59
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   RFC2478 Compliant SPNEGO implementation
+
+   Copyright (C) Jim McDonough <jmcd@us.ibm.com>   2003
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+ssize_t spnego_read_data(TALLOC_CTX *mem_ctx, DATA_BLOB data, struct spnego_data *token);
+ssize_t spnego_write_data(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct spnego_data *spnego);
+bool spnego_free_data(struct spnego_data *spnego);
+bool spnego_write_mech_types(TALLOC_CTX *mem_ctx,
+                            const char **mech_types,
+                            DATA_BLOB *blob);
index f18a326e9973d6a09e3bc93c1ae7ec76157a3633..dbe11604fd827949eaef6ad5913bb22ee4029142 100644 (file)
@@ -50,7 +50,7 @@ struct security_descriptor *security_descriptor_initialise(TALLOC_CTX *mem_ctx)
        return sd;
 }
 
-static struct security_acl *security_acl_dup(TALLOC_CTX *mem_ctx,
+struct security_acl *security_acl_dup(TALLOC_CTX *mem_ctx,
                                             const struct security_acl *oacl)
 {
        struct security_acl *nacl;
index c535f5d253527424675b2eaa31733f198381731b..a377ef59ce2b5133fe7a3cade144e3d0a5b4f878 100644 (file)
@@ -61,4 +61,7 @@ struct security_ace *security_ace_create(TALLOC_CTX *mem_ctx,
                                         uint32_t access_mask,
                                         uint8_t flags);
 
+struct security_acl *security_acl_dup(TALLOC_CTX *mem_ctx,
+                                     const struct security_acl *oacl);
+
 #endif /* __SECURITY_DESCRIPTOR_H__ */
index 6af197284f97e3db1d380660353f593ae56ab3f8..5e741384677e8cd477380687c3caf65642806217 100644 (file)
@@ -179,7 +179,6 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_INVALID_USER_BUFFER", WERR_INVALID_USER_BUFFER },
        { "WERR_NO_TRUST_SAM_ACCOUNT", WERR_NO_TRUST_SAM_ACCOUNT },
        { "WERR_INVALID_PRINTER_COMMAND", WERR_INVALID_PRINTER_COMMAND },
-       { "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
        { "WERR_NO_SHUTDOWN_IN_PROGRESS", WERR_NO_SHUTDOWN_IN_PROGRESS },
        { "WERR_SHUTDOWN_ALREADY_IN_PROGRESS", WERR_SHUTDOWN_ALREADY_IN_PROGRESS },
        { "WERR_SEC_E_ENCRYPT_FAILURE", WERR_SEC_E_ENCRYPT_FAILURE },
@@ -217,6 +216,7 @@ static const struct werror_code_struct dos_errs[] =
        { "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR },
        { "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
        { "WERR_WRONG_PASSWORD", WERR_WRONG_PASSWORD },
+       { "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
        { NULL, W_ERROR(0) }
 };
 
index 5ef429598e7bfeec724440e0f5cfe4ea810f0c91..1025f472104f2ba027a680e4191a9efaa20c5aed 100644 (file)
@@ -637,8 +637,8 @@ NTSTATUS nt_status_string_to_code(const char *nt_status_str);
 /** Used by ntstatus_dos_equal: */
 extern bool ntstatus_check_dos_mapping;
 
-#define NT_STATUS_IS_OK(x) (NT_STATUS_V(x) == 0)
-#define NT_STATUS_IS_ERR(x) ((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000)
+#define NT_STATUS_IS_OK(x) (likely(NT_STATUS_V(x) == 0))
+#define NT_STATUS_IS_ERR(x) (unlikely((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000))
 /* checking for DOS error mapping here is ugly, but unfortunately the
    alternative is a very intrusive rewrite of the torture code */
 #if _SAMBA_BUILD_ == 4
@@ -648,7 +648,7 @@ extern bool ntstatus_check_dos_mapping;
 #endif
 
 #define NT_STATUS_HAVE_NO_MEMORY(x) do { \
-       if (!(x)) {\
+       if (unlikely(!(x))) {           \
                return NT_STATUS_NO_MEMORY;\
        }\
 } while (0)
index f82879cac93a9be0e5b0d49f4f648faff4ac066c..d64746b363fe70845cdc410660994706e3933a69 100644 (file)
@@ -74,139 +74,130 @@ typedef uint32_t WERROR;
 
 /* these are win32 error codes. There are only a few places where
    these matter for Samba, primarily in the NT printing code */
-#define WERR_OK W_ERROR(0)
-#define WERR_BADFUNC W_ERROR(1)
-#define WERR_BADFILE W_ERROR(2)
-#define WERR_ACCESS_DENIED W_ERROR(5)
-#define WERR_BADFID W_ERROR(6)
-#define WERR_NOMEM W_ERROR(8)
-#define WERR_GENERAL_FAILURE W_ERROR(31)
-#define WERR_NOT_SUPPORTED W_ERROR(50)
-#define WERR_DUP_NAME W_ERROR(52)
-#define WERR_BAD_NETPATH W_ERROR(53)
-#define WERR_BAD_NET_RESP W_ERROR(58)
-#define WERR_UNEXP_NET_ERR W_ERROR(59)
-#define WERR_DEVICE_NOT_EXIST W_ERROR(55)
-#define WERR_PRINTQ_FULL W_ERROR(61)
-#define WERR_NO_SPOOL_SPACE W_ERROR(62)
-#define WERR_NO_SUCH_SHARE W_ERROR(67)
-#define WERR_FILE_EXISTS W_ERROR(80)
-#define WERR_BAD_PASSWORD W_ERROR(86)
-#define WERR_INVALID_PARAM W_ERROR(87)
-#define WERR_CALL_NOT_IMPLEMENTED W_ERROR(120)
-#define WERR_SEM_TIMEOUT W_ERROR(121)
-#define WERR_INSUFFICIENT_BUFFER W_ERROR(122)
-#define WERR_INVALID_NAME W_ERROR(123)
-#define WERR_UNKNOWN_LEVEL W_ERROR(124)
-#define WERR_OBJECT_PATH_INVALID W_ERROR(161)
-#define WERR_ALREADY_EXISTS W_ERROR(183)
-#define WERR_NO_MORE_ITEMS W_ERROR(259)
-#define WERR_MORE_DATA W_ERROR(234)
-#define WERR_INVALID_OWNER W_ERROR(1307)
-#define WERR_IO_PENDING W_ERROR(997)
-#define WERR_CAN_NOT_COMPLETE W_ERROR(1003)
-#define WERR_INVALID_FLAGS W_ERROR(1004)
-#define WERR_REG_CORRUPT W_ERROR(1015)
-#define WERR_REG_IO_FAILURE W_ERROR(1016)
-#define WERR_REG_FILE_INVALID W_ERROR(1017)
-#define WERR_NO_SUCH_SERVICE W_ERROR(1060)
-#define WERR_INVALID_SERVICE_CONTROL W_ERROR(1052)
-#define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056)
-#define WERR_SERVICE_DISABLED W_ERROR(1058)
-#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(1072)
-#define WERR_SERVICE_EXISTS W_ERROR(1073)
-#define WERR_SERVICE_NEVER_STARTED W_ERROR(1077)
-#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(1078)
-#define WERR_DEVICE_NOT_CONNECTED W_ERROR(1167)
-#define WERR_NOT_FOUND W_ERROR(1168)
-#define WERR_INVALID_COMPUTERNAME W_ERROR(1210)
-#define WERR_INVALID_DOMAINNAME W_ERROR(1212)
-#define WERR_NOT_AUTHENTICATED W_ERROR(1244)
-#define WERR_UNKNOWN_REVISION W_ERROR(1305)
-#define WERR_MACHINE_LOCKED W_ERROR(1271)
-#define WERR_REVISION_MISMATCH W_ERROR(1306)
-#define WERR_INVALID_OWNER W_ERROR(1307)
-#define WERR_INVALID_PRIMARY_GROUP W_ERROR(1308)
-#define WERR_NO_LOGON_SERVERS W_ERROR(1311)
-#define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312)
-#define WERR_NO_SUCH_PRIVILEGE W_ERROR(1313)
-#define WERR_PRIVILEGE_NOT_HELD W_ERROR(1314)
-#define WERR_USER_ALREADY_EXISTS W_ERROR(1316)
-#define WERR_NO_SUCH_USER W_ERROR(1317)
-#define WERR_GROUP_EXISTS W_ERROR(1318)
-#define WERR_NO_SUCH_GROUP W_ERROR(1319)
-#define WERR_MEMBER_IN_GROUP W_ERROR(1320)
-#define WERR_USER_NOT_IN_GROUP W_ERROR(1321)
-#define WERR_WRONG_PASSWORD W_ERROR(1323)
-#define WERR_PASSWORD_RESTRICTION W_ERROR(1325)
-#define WERR_LOGON_FAILURE W_ERROR(1326)
-#define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
-#define WERR_NONE_MAPPED W_ERROR(1332)
-#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(1338)
-#define WERR_INVALID_DOMAIN_STATE W_ERROR(1353)
-#define WERR_INVALID_DOMAIN_ROLE W_ERROR(1354)
-#define WERR_NO_SUCH_DOMAIN W_ERROR(1355)
-#define WERR_NO_SYSTEM_RESOURCES W_ERROR(1450)
-#define WERR_SPECIAL_ACCOUNT W_ERROR(1371)
-#define WERR_NO_SUCH_ALIAS W_ERROR(1376)
-#define WERR_MEMBER_IN_ALIAS W_ERROR(1378)
-#define WERR_ALIAS_EXISTS W_ERROR(1379)
-#define WERR_TIME_SKEW W_ERROR(1398)
-#define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(1500)
-#define WERR_SERVER_UNAVAILABLE W_ERROR(1722)
-#define WERR_INVALID_USER_BUFFER W_ERROR(1784)
-#define WERR_NO_TRUST_SAM_ACCOUNT W_ERROR(1787)
-#define WERR_INVALID_FORM_NAME W_ERROR(1902)
-#define WERR_INVALID_FORM_SIZE W_ERROR(1903)
-#define WERR_PASSWORD_MUST_CHANGE W_ERROR(1907)
-#define WERR_ACCOUNT_LOCKED_OUT W_ERROR(1909)
-#define WERR_ALREADY_SHARED W_ERROR(2118)
-#define WERR_NOT_CONNECTED W_ERROR(2250)
-#define WERR_NAME_NOT_FOUND W_ERROR(2273)
-#define WERR_SESSION_NOT_FOUND W_ERROR(2312)
-#define WERR_FID_NOT_FOUND W_ERROR(2314)
-#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(2453)
-#define WERR_TIME_DIFF_AT_DC W_ERROR(2457)
+#define WERR_OK W_ERROR(0x00000000)
+#define WERR_BADFUNC W_ERROR(0x00000001)
+#define WERR_BADFILE W_ERROR(0x00000002)
+#define WERR_ACCESS_DENIED W_ERROR(0x00000005)
+#define WERR_BADFID W_ERROR(0x00000006)
+#define WERR_NOMEM W_ERROR(0x00000008)
+#define WERR_GENERAL_FAILURE W_ERROR(0x0000001F)
+#define WERR_NOT_SUPPORTED W_ERROR(0x00000032)
+#define WERR_DUP_NAME W_ERROR(0x00000034)
+#define WERR_BAD_NETPATH W_ERROR(0x00000035)
+#define WERR_BAD_NET_RESP W_ERROR(0x0000003A)
+#define WERR_UNEXP_NET_ERR W_ERROR(0x0000003B)
+#define WERR_DEVICE_NOT_EXIST W_ERROR(0x00000037)
+#define WERR_PRINTQ_FULL W_ERROR(0x0000003D)
+#define WERR_NO_SPOOL_SPACE W_ERROR(0x0000003E)
+#define WERR_NO_SUCH_SHARE W_ERROR(0x00000043)
+#define WERR_FILE_EXISTS W_ERROR(0x00000050)
+#define WERR_BAD_PASSWORD W_ERROR(0x00000056)
+#define WERR_INVALID_PARAM W_ERROR(0x00000057)
+#define WERR_CALL_NOT_IMPLEMENTED W_ERROR(0x00000078)
+#define WERR_SEM_TIMEOUT W_ERROR(0x00000079)
+#define WERR_INSUFFICIENT_BUFFER W_ERROR(0x0000007A)
+#define WERR_INVALID_NAME W_ERROR(0x0000007B)
+#define WERR_UNKNOWN_LEVEL W_ERROR(0x0000007C)
+#define WERR_OBJECT_PATH_INVALID W_ERROR(0x000000A1)
+#define WERR_ALREADY_EXISTS W_ERROR(0x000000B7)
+#define WERR_MORE_DATA W_ERROR(0x000000EA)
+#define WERR_NO_MORE_ITEMS W_ERROR(0x00000103)
+#define WERR_STATUS_MORE_ENTRIES W_ERROR(0x00000105)
+#define WERR_IO_PENDING W_ERROR(0x000003E5)
+#define WERR_CAN_NOT_COMPLETE W_ERROR(0x000003EB)
+#define WERR_INVALID_FLAGS W_ERROR(0x000003EC)
+#define WERR_REG_CORRUPT W_ERROR(0x000003F7)
+#define WERR_REG_IO_FAILURE W_ERROR(0x000003F8)
+#define WERR_REG_FILE_INVALID W_ERROR(0x000003F9)
+#define WERR_INVALID_SERVICE_CONTROL W_ERROR(0x0000041C)
+#define WERR_SERVICE_ALREADY_RUNNING W_ERROR(0x00000420)
+#define WERR_SERVICE_DISABLED W_ERROR(0x00000422)
+#define WERR_NO_SUCH_SERVICE W_ERROR(0x00000424)
+#define WERR_SERVICE_MARKED_FOR_DELETE W_ERROR(0x00000430)
+#define WERR_SERVICE_EXISTS W_ERROR(0x00000431)
+#define WERR_SERVICE_NEVER_STARTED W_ERROR(0x00000435)
+#define WERR_DUPLICATE_SERVICE_NAME W_ERROR(0x00000436)
+#define WERR_DEVICE_NOT_CONNECTED W_ERROR(0x0000048F)
+#define WERR_NOT_FOUND W_ERROR(0x00000490)
+#define WERR_INVALID_COMPUTERNAME W_ERROR(0x000004BA)
+#define WERR_INVALID_DOMAINNAME W_ERROR(0x000004BC)
+#define WERR_NOT_AUTHENTICATED W_ERROR(0x000004DC)
+#define WERR_MACHINE_LOCKED W_ERROR(0x000004F7)
+#define WERR_UNKNOWN_REVISION W_ERROR(0x00000519)
+#define WERR_INVALID_OWNER W_ERROR(0x0000051B)
+#define WERR_REVISION_MISMATCH W_ERROR(0x0000051A)
+#define WERR_INVALID_OWNER W_ERROR(0x0000051B)
+#define WERR_INVALID_PRIMARY_GROUP W_ERROR(0x0000051C)
+#define WERR_NO_LOGON_SERVERS W_ERROR(0x0000051F)
+#define WERR_NO_SUCH_LOGON_SESSION W_ERROR(0x00000520)
+#define WERR_NO_SUCH_PRIVILEGE W_ERROR(0x00000521)
+#define WERR_PRIVILEGE_NOT_HELD W_ERROR(0x00000522)
+#define WERR_USER_ALREADY_EXISTS W_ERROR(0x00000524)
+#define WERR_NO_SUCH_USER W_ERROR(0x00000525)
+#define WERR_GROUP_EXISTS W_ERROR(0x00000526)
+#define WERR_NO_SUCH_GROUP W_ERROR(0x00000527)
+#define WERR_MEMBER_IN_GROUP W_ERROR(0x00000528)
+#define WERR_USER_NOT_IN_GROUP W_ERROR(0x00000529)
+#define WERR_WRONG_PASSWORD W_ERROR(0x0000052B)
+#define WERR_PASSWORD_RESTRICTION W_ERROR(0x0000052D)
+#define WERR_LOGON_FAILURE W_ERROR(0x0000052E)
+#define WERR_NONE_MAPPED W_ERROR(0x00000534)
+#define WERR_INVALID_SECURITY_DESCRIPTOR W_ERROR(0x0000053A)
+#define WERR_INVALID_DOMAIN_STATE W_ERROR(0x00000549)
+#define WERR_INVALID_DOMAIN_ROLE W_ERROR(0x0000054A)
+#define WERR_NO_SUCH_DOMAIN W_ERROR(0x0000054B)
+#define WERR_SPECIAL_ACCOUNT W_ERROR(0x0000055B)
+#define WERR_NO_SUCH_ALIAS W_ERROR(0x00000560)
+#define WERR_MEMBER_IN_ALIAS W_ERROR(0x00000562)
+#define WERR_ALIAS_EXISTS W_ERROR(0x00000563)
+#define WERR_TIME_SKEW W_ERROR(0x00000576)
+#define WERR_NO_SYSTEM_RESOURCES W_ERROR(0x000005AA)
+#define WERR_EVENTLOG_FILE_CORRUPT W_ERROR(0x000005DC)
+#define WERR_SERVER_UNAVAILABLE W_ERROR(0x000006BA)
+#define WERR_INVALID_USER_BUFFER W_ERROR(0x000006F8)
+#define WERR_NO_TRUST_SAM_ACCOUNT W_ERROR(0x000006FB)
+#define WERR_INVALID_FORM_NAME W_ERROR(0x0000076E)
+#define WERR_INVALID_FORM_SIZE W_ERROR(0x0000076F)
+#define WERR_PASSWORD_MUST_CHANGE W_ERROR(0x00000773)
+#define WERR_ACCOUNT_LOCKED_OUT W_ERROR(0x00000775)
 
-#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(4319)
-#define WERR_STATUS_MORE_ENTRIES   W_ERROR(0x0105)
+#define WERR_DOMAIN_CONTROLLER_NOT_FOUND W_ERROR(0x00000995) /* Error code is wrong, should be  0x00000774 (1908)*/
 
-#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED W_ERROR(ERRdriveralreadyinstalled)
-#define WERR_UNKNOWN_PORT W_ERROR(ERRunknownprinterport)
-#define WERR_UNKNOWN_PRINTER_DRIVER W_ERROR(ERRunknownprinterdriver)
-#define WERR_UNKNOWN_PRINTPROCESSOR W_ERROR(ERRunknownprintprocessor)
-#define WERR_INVALID_SEPARATOR_FILE W_ERROR(ERRinvalidseparatorfile)
-#define WERR_INVALID_PRIORITY W_ERROR(ERRinvalidjobpriority)
-#define WERR_INVALID_PRINTER_NAME W_ERROR(ERRinvalidprintername)
-#define WERR_PRINTER_ALREADY_EXISTS W_ERROR(ERRprinteralreadyexists)
-#define WERR_INVALID_PRINTER_COMMAND W_ERROR(ERRinvalidprintercommand)
-#define WERR_INVALID_DATATYPE W_ERROR(ERRinvaliddatatype)
-#define WERR_INVALID_ENVIRONMENT W_ERROR(ERRinvalidenvironment)
+#define WERR_DEVICE_NOT_AVAILABLE W_ERROR(0x000010DF)
 
-#define WERR_UNKNOWN_PRINT_MONITOR W_ERROR(ERRunknownprintmonitor)
-#define WERR_PRINTER_DRIVER_IN_USE W_ERROR(ERRprinterdriverinuse)
-#define WERR_SPOOL_FILE_NOT_FOUND W_ERROR(ERRspoolfilenotfound)
-#define WERR_SPL_NO_STARTDOC W_ERROR(ERRnostartdoc)
-#define WERR_SPL_NO_ADDJOB W_ERROR(ERRnoaddjob)
-#define WERR_PRINT_PROCESSOR_ALREADY_INSTALLED W_ERROR(ERRprintprocessoralreadyinstalled)
-#define WERR_PRINT_MONITOR_ALREADY_INSTALLED W_ERROR(ERRprintmonitoralreadyinstalled)
-#define WERR_INVALID_PRINT_MONITOR W_ERROR(ERRinvalidprintmonitor)
-#define WERR_PRINT_MONITOR_IN_USE W_ERROR(ERRprintmonitorinuse)
-#define WERR_PRINTER_HAS_JOBS_QUEUED W_ERROR(ERRprinterhasjobsqueued)
+#define WERR_PRINTER_DRIVER_ALREADY_INSTALLED  W_ERROR(0x00000703)
+#define WERR_UNKNOWN_PORT                      W_ERROR(0x00000704)
+#define WERR_UNKNOWN_PRINTER_DRIVER            W_ERROR(0x00000705)
+#define WERR_UNKNOWN_PRINTPROCESSOR            W_ERROR(0x00000706)
+#define WERR_INVALID_SEPARATOR_FILE            W_ERROR(0x00000707)
+#define WERR_INVALID_PRIORITY                  W_ERROR(0x00000708)
+#define WERR_INVALID_PRINTER_NAME              W_ERROR(0x00000709)
+#define WERR_PRINTER_ALREADY_EXISTS            W_ERROR(0x0000070A)
+#define WERR_INVALID_PRINTER_COMMAND           W_ERROR(0x0000070B)
+#define WERR_INVALID_DATATYPE                  W_ERROR(0x0000070C)
+#define WERR_INVALID_ENVIRONMENT               W_ERROR(0x0000070D)
+
+#define WERR_UNKNOWN_PRINT_MONITOR             W_ERROR(0x00000BB8)
+#define WERR_PRINTER_DRIVER_IN_USE             W_ERROR(0x00000BB9)
+#define WERR_SPOOL_FILE_NOT_FOUND              W_ERROR(0x00000BBA)
+#define WERR_SPL_NO_STARTDOC                   W_ERROR(0x00000BBB)
+#define WERR_SPL_NO_ADDJOB                     W_ERROR(0x00000BBC)
+#define WERR_PRINT_PROCESSOR_ALREADY_INSTALLED W_ERROR(0x00000BBD)
+#define WERR_PRINT_MONITOR_ALREADY_INSTALLED   W_ERROR(0x00000BBE)
+#define WERR_INVALID_PRINT_MONITOR             W_ERROR(0x00000BBF)
+#define WERR_PRINT_MONITOR_IN_USE              W_ERROR(0x00000BC0)
+#define WERR_PRINTER_HAS_JOBS_QUEUED           W_ERROR(0x00000BC1)
+
+#define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x0000045c)
+#define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x0000045b)
 
-#define WERR_CLASS_NOT_REGISTERED W_ERROR(0x40154)
-#define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x45c)
-#define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x45b)
 /* Configuration Manager Errors */
 /* Basically Win32 errors meanings are specific to the \ntsvcs pipe */
-
 #define WERR_CM_INVALID_POINTER W_ERROR(3)
 #define WERR_CM_BUFFER_SMALL W_ERROR(26)
 #define WERR_CM_NO_MORE_HW_PROFILES W_ERROR(35)
 #define WERR_CM_NO_SUCH_VALUE W_ERROR(37)
 
-#define WERR_DEVICE_NOT_SHARED         W_ERROR(NERR_BASE+211)
-
 /* DFS errors */
 
 #ifndef NERR_BASE
@@ -217,24 +208,31 @@ typedef uint32_t WERROR;
 #define MAX_NERR (NERR_BASE+899)
 #endif
 
-#define WERR_BUF_TOO_SMALL             W_ERROR(NERR_BASE+23)
-#define WERR_JOB_NOT_FOUND             W_ERROR(NERR_BASE+51)
-#define WERR_DEST_NOT_FOUND            W_ERROR(NERR_BASE+52)
-#define WERR_GROUP_NOT_FOUND           W_ERROR(NERR_BASE+120)
-#define WERR_USER_NOT_FOUND            W_ERROR(NERR_BASE+121)
-#define WERR_USER_EXISTS               W_ERROR(NERR_BASE+124)
-#define WERR_NET_NAME_NOT_FOUND                W_ERROR(NERR_BASE+210)
-#define WERR_NOT_LOCAL_DOMAIN          W_ERROR(NERR_BASE+220)
-#define WERR_DC_NOT_FOUND              W_ERROR(NERR_BASE+353)
-#define WERR_DFS_NO_SUCH_VOL            W_ERROR(NERR_BASE+562)
-#define WERR_DFS_NO_SUCH_SHARE          W_ERROR(NERR_BASE+565)
-#define WERR_DFS_NO_SUCH_SERVER         W_ERROR(NERR_BASE+573)
-#define WERR_DFS_INTERNAL_ERROR         W_ERROR(NERR_BASE+590)
-#define WERR_DFS_CANT_CREATE_JUNCT      W_ERROR(NERR_BASE+569)
-#define WERR_SETUP_ALREADY_JOINED      W_ERROR(NERR_BASE+591)
-#define WERR_SETUP_NOT_JOINED          W_ERROR(NERR_BASE+592)
-#define WERR_SETUP_DOMAIN_CONTROLLER   W_ERROR(NERR_BASE+593)
-#define WERR_DEFAULT_JOIN_REQUIRED     W_ERROR(NERR_BASE+594)
+#define WERR_BUF_TOO_SMALL             W_ERROR(0x0000084B)
+#define WERR_ALREADY_SHARED            W_ERROR(0x00000846)
+#define WERR_JOB_NOT_FOUND             W_ERROR(0x00000867)
+#define WERR_DEST_NOT_FOUND            W_ERROR(0x00000868)
+#define WERR_GROUP_NOT_FOUND           W_ERROR(0x000008AC)
+#define WERR_USER_NOT_FOUND            W_ERROR(0x000008AD)
+#define WERR_USER_EXISTS               W_ERROR(0x000008B0)
+#define WERR_NOT_CONNECTED             W_ERROR(0x000008CA)
+#define WERR_NAME_NOT_FOUND            W_ERROR(0x000008E1)
+#define WERR_NET_NAME_NOT_FOUND                W_ERROR(0x00000906)
+#define WERR_SESSION_NOT_FOUND         W_ERROR(0x00000908)
+#define WERR_DEVICE_NOT_SHARED         W_ERROR(0x00000907)
+#define WERR_FID_NOT_FOUND             W_ERROR(0x0000090A)
+#define WERR_NOT_LOCAL_DOMAIN          W_ERROR(0x00000910)
+#define WERR_DC_NOT_FOUND              W_ERROR(0x00000995)
+#define WERR_TIME_DIFF_AT_DC           W_ERROR(0x00000999)
+#define WERR_DFS_NO_SUCH_VOL           W_ERROR(0x00000A66)
+#define WERR_DFS_NO_SUCH_SHARE         W_ERROR(0x00000A69)
+#define WERR_DFS_NO_SUCH_SERVER                W_ERROR(0x00000A71)
+#define WERR_DFS_INTERNAL_ERROR                W_ERROR(0x00000A82)
+#define WERR_DFS_CANT_CREATE_JUNCT     W_ERROR(0x00000A6D)
+#define WERR_SETUP_ALREADY_JOINED      W_ERROR(0x00000A83)
+#define WERR_SETUP_NOT_JOINED          W_ERROR(0x00000A84)
+#define WERR_SETUP_DOMAIN_CONTROLLER   W_ERROR(0x00000A85)
+#define WERR_DEFAULT_JOIN_REQUIRED     W_ERROR(0x00000A86)
 
 /* DS errors */
 #define WERR_DS_NO_ATTRIBUTE_OR_VALUE W_ERROR(0x0000200A)
@@ -298,6 +296,7 @@ typedef uint32_t WERROR;
 #define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(FRS_ERR_BASE+15)
 #define WERR_FRS_INVALID_SERVICE_PARAMETER W_ERROR(FRS_ERR_BASE+17)
 
+/* RPC/COM/OLE HRESULT error codes */
 /* RPC errors */
 #define WERR_RPC_E_INVALID_HEADER      W_ERROR(0x80010111)
 #define WERR_RPC_E_REMOTE_DISABLED     W_ERROR(0x8001011c)
@@ -307,6 +306,10 @@ typedef uint32_t WERROR;
 #define WERR_SEC_E_DECRYPT_FAILURE     W_ERROR(0x80090330)
 #define WERR_SEC_E_ALGORITHM_MISMATCH  W_ERROR(0x80090331)
 
+/* COM REGDB error codes */
+#define WERR_CLASS_NOT_REGISTERED      W_ERROR(0x80040154)     /* REGDB_E_CLASSNOTREG */
+
+/* Generic error code aliases */
 #define WERR_FOOBAR WERR_GENERAL_FAILURE
 
 /*****************************************************************************
index dc7d80185a2b9662c7fda092416eab198ca2d129..429ccacb490b8713c6dde7587450a290350e8a4a 100644 (file)
@@ -105,21 +105,24 @@ uint32_t ds_gtype2atype(uint32_t gtype)
                case GTYPE_SECURITY_BUILTIN_LOCAL_GROUP:
                        atype = ATYPE_SECURITY_LOCAL_GROUP;
                        break;
+               case GTYPE_SECURITY_GLOBAL_GROUP:
+                       atype = ATYPE_SECURITY_GLOBAL_GROUP;
+                       break;
                case GTYPE_SECURITY_DOMAIN_LOCAL_GROUP:
                        atype = ATYPE_SECURITY_LOCAL_GROUP;
                        break;
-               case GTYPE_SECURITY_GLOBAL_GROUP:
-                       atype = ATYPE_SECURITY_GLOBAL_GROUP;
+               case GTYPE_SECURITY_UNIVERSAL_GROUP:
+                       atype = ATYPE_SECURITY_UNIVERSAL_GROUP;
                        break;
 
                case GTYPE_DISTRIBUTION_GLOBAL_GROUP:
                        atype = ATYPE_DISTRIBUTION_GLOBAL_GROUP;
                        break;
                case GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP;
+                       atype = ATYPE_DISTRIBUTION_LOCAL_GROUP;
                        break;
                case GTYPE_DISTRIBUTION_UNIVERSAL_GROUP:
-                       atype = ATYPE_DISTRIBUTION_LOCAL_GROUP;
+                       atype = ATYPE_DISTRIBUTION_UNIVERSAL_GROUP;
                        break;
        }
 
index 2b342af8d6a1e137ae2e9e5514888f11cb5b2d8d..dfdd603a1546ad4e2d8cf968b3b0af218ef081fd 100644 (file)
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* UserFlags for userAccountControl */
+/* User flags for "userAccountControl" */
 #define UF_SCRIPT                              0x00000001  /* NT or Lan Manager Login script must be executed */
 #define UF_ACCOUNTDISABLE                      0x00000002
 #define UF_00000004                            0x00000004
                UF_DONT_REQUIRE_PREAUTH \
                )
 
-/* sAMAccountType */
-#define ATYPE_NORMAL_ACCOUNT                   0x30000000 /* 805306368 */
-#define ATYPE_WORKSTATION_TRUST                        0x30000001 /* 805306369 */
-#define ATYPE_INTERDOMAIN_TRUST                        0x30000002 /* 805306370 */
-#define ATYPE_SECURITY_GLOBAL_GROUP            0x10000000 /* 268435456 */
-#define ATYPE_DISTRIBUTION_GLOBAL_GROUP                0x10000001 /* 268435457 */
-#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP     ATYPE_DISTRIBUTION_GLOBAL_GROUP
-#define ATYPE_SECURITY_LOCAL_GROUP             0x20000000 /* 536870912 */
-#define ATYPE_DISTRIBUTION_LOCAL_GROUP         0x20000001 /* 536870913 */
-
-#define ATYPE_ACCOUNT          ATYPE_NORMAL_ACCOUNT            /* 0x30000000 805306368 */
-#define ATYPE_GLOBAL_GROUP     ATYPE_SECURITY_GLOBAL_GROUP     /* 0x10000000 268435456 */
-#define ATYPE_LOCAL_GROUP      ATYPE_SECURITY_LOCAL_GROUP      /* 0x20000000 536870912 */
-
-/* groupType */
+/* Group flags for "groupType" */
 #define GROUP_TYPE_BUILTIN_LOCAL_GROUP         0x00000001
 #define GROUP_TYPE_ACCOUNT_GROUP               0x00000002
 #define GROUP_TYPE_RESOURCE_GROUP              0x00000004
 #define GTYPE_DISTRIBUTION_DOMAIN_LOCAL_GROUP  0x00000004      /* 4 */
 #define GTYPE_DISTRIBUTION_UNIVERSAL_GROUP     0x00000008      /* 8 */
 
+/* Account flags for "sAMAccountType" */
+#define ATYPE_NORMAL_ACCOUNT                   0x30000000 /* 805306368 */
+#define ATYPE_WORKSTATION_TRUST                        0x30000001 /* 805306369 */
+#define ATYPE_INTERDOMAIN_TRUST                        0x30000002 /* 805306370 */
+#define ATYPE_SECURITY_GLOBAL_GROUP            0x10000000 /* 268435456 */
+#define ATYPE_SECURITY_LOCAL_GROUP             0x20000000 /* 536870912 */
+#define ATYPE_SECURITY_UNIVERSAL_GROUP         ATYPE_SECURITY_GLOBAL_GROUP
+#define ATYPE_DISTRIBUTION_GLOBAL_GROUP                0x10000001 /* 268435457 */
+#define ATYPE_DISTRIBUTION_LOCAL_GROUP         0x20000001 /* 536870913 */
+#define ATYPE_DISTRIBUTION_UNIVERSAL_GROUP     ATYPE_DISTRIBUTION_GLOBAL_GROUP
+
+#define ATYPE_ACCOUNT          ATYPE_NORMAL_ACCOUNT            /* 0x30000000 805306368 */
+#define ATYPE_GLOBAL_GROUP     ATYPE_SECURITY_GLOBAL_GROUP     /* 0x10000000 268435456 */
+#define ATYPE_LOCAL_GROUP      ATYPE_SECURITY_LOCAL_GROUP      /* 0x20000000 536870912 */
+
+/* "instanceType" */
 #define INSTANCE_TYPE_IS_NC_HEAD       0x00000001
 #define INSTANCE_TYPE_UNINSTANT                0x00000002
 #define INSTANCE_TYPE_WRITE            0x00000004
 #define INSTANCE_TYPE_NC_COMING                0x00000010
 #define INSTANCE_TYPE_NC_GOING         0x00000020
 
+/* "systemFlags" */
 #define SYSTEM_FLAG_CR_NTDS_NC                 0x00000001
 #define SYSTEM_FLAG_CR_NTDS_DOMAIN             0x00000002
 #define SYSTEM_FLAG_CR_NTDS_NOT_GC_REPLICATED  0x00000004
 #define SYSTEM_FLAG_CONFIG_ALLOW_RENAME                0x40000000
 #define SYSTEM_FLAG_DISALLOW_DELTE             0x80000000
 
+/* "searchFlags" */
 #define SEARCH_FLAG_ATTINDEX           0x0000001
 #define SEARCH_FLAG_PDNTATTINDEX       0x0000002
 #define SEARCH_FLAG_ANR                        0x0000004
 #define SEARCH_FLAG_NEVERVALUEAUDIT    0x0000100
 #define SEARCH_FLAG_RODC_ATTRIBUTE     0x0000200
 
-#define DS_BEHAVIOR_WIN2000            0
-#define DS_BEHAVIOR_WIN2003_INTERIM    1
-#define DS_BEHAVIOR_WIN2003            2
-#define DS_BEHAVIOR_WIN2008            3
-
-/* Settings for the domainFunctionality attribute in the rootDSE */
-
+/* "domainFunctionality", "forestFunctionality" in the rootDSE */
 #define DS_DOMAIN_FUNCTION_2000                0
-#define DS_DOMAIN_FUCNTION_2003_MIXED  1
+#define DS_DOMAIN_FUNCTION_2003_MIXED  1
 #define DS_DOMAIN_FUNCTION_2003                2
 #define DS_DOMAIN_FUNCTION_2008                3
+#define DS_DOMAIN_FUNCTION_2008_R2     4 
+
+/* "domainControllerFunctionality" in the rootDSE */
+#define DS_DC_FUNCTION_2000            0
+#define DS_DC_FUNCTION_2003            2
+#define DS_DC_FUNCTION_2008            3
+#define DS_DC_FUNCTION_2008_R2         4
 
index 43d41eacb0270acffee871f0c93a8e77ddfd5d34..69171dc34dcfbc98cd124f4103b836cc1ca7241d 100644 (file)
@@ -3047,25 +3047,28 @@ NTSTATUS rpccli_drsuapi_DsAddEntry(struct rpc_pipe_client *cli,
        return werror_to_ntstatus(r.out.result);
 }
 
-struct rpccli_DRSUAPI_EXECUTE_KCC_state {
-       struct DRSUAPI_EXECUTE_KCC orig;
-       struct DRSUAPI_EXECUTE_KCC tmp;
+struct rpccli_drsuapi_DsExecuteKCC_state {
+       struct drsuapi_DsExecuteKCC orig;
+       struct drsuapi_DsExecuteKCC tmp;
        TALLOC_CTX *out_mem_ctx;
        NTSTATUS (*dispatch_recv)(struct tevent_req *req, TALLOC_CTX *mem_ctx);
 };
 
-static void rpccli_DRSUAPI_EXECUTE_KCC_done(struct tevent_req *subreq);
+static void rpccli_drsuapi_DsExecuteKCC_done(struct tevent_req *subreq);
 
-struct tevent_req *rpccli_DRSUAPI_EXECUTE_KCC_send(TALLOC_CTX *mem_ctx,
-                                                  struct tevent_context *ev,
-                                                  struct rpc_pipe_client *cli)
+struct tevent_req *rpccli_drsuapi_DsExecuteKCC_send(TALLOC_CTX *mem_ctx,
+                                                   struct tevent_context *ev,
+                                                   struct rpc_pipe_client *cli,
+                                                   struct policy_handle *_bind_handle /* [in] [ref] */,
+                                                   uint32_t _level /* [in]  */,
+                                                   union drsuapi_DsExecuteKCCRequest *_req /* [in] [ref,switch_is(level)] */)
 {
        struct tevent_req *req;
-       struct rpccli_DRSUAPI_EXECUTE_KCC_state *state;
+       struct rpccli_drsuapi_DsExecuteKCC_state *state;
        struct tevent_req *subreq;
 
        req = tevent_req_create(mem_ctx, &state,
-                               struct rpccli_DRSUAPI_EXECUTE_KCC_state);
+                               struct rpccli_drsuapi_DsExecuteKCC_state);
        if (req == NULL) {
                return NULL;
        }
@@ -3073,6 +3076,9 @@ struct tevent_req *rpccli_DRSUAPI_EXECUTE_KCC_send(TALLOC_CTX *mem_ctx,
        state->dispatch_recv = cli->dispatch_recv;
 
        /* In parameters */
+       state->orig.in.bind_handle = _bind_handle;
+       state->orig.in.level = _level;
+       state->orig.in.req = _req;
 
        /* Out parameters */
 
@@ -3080,7 +3086,7 @@ struct tevent_req *rpccli_DRSUAPI_EXECUTE_KCC_send(TALLOC_CTX *mem_ctx,
        ZERO_STRUCT(state->orig.out.result);
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_IN_DEBUG(DRSUAPI_EXECUTE_KCC, &state->orig);
+               NDR_PRINT_IN_DEBUG(drsuapi_DsExecuteKCC, &state->orig);
        }
 
        /* make a temporary copy, that we pass to the dispatch function */
@@ -3088,21 +3094,21 @@ struct tevent_req *rpccli_DRSUAPI_EXECUTE_KCC_send(TALLOC_CTX *mem_ctx,
 
        subreq = cli->dispatch_send(state, ev, cli,
                                    &ndr_table_drsuapi,
-                                   NDR_DRSUAPI_EXECUTE_KCC,
+                                   NDR_DRSUAPI_DSEXECUTEKCC,
                                    &state->tmp);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, rpccli_DRSUAPI_EXECUTE_KCC_done, req);
+       tevent_req_set_callback(subreq, rpccli_drsuapi_DsExecuteKCC_done, req);
        return req;
 }
 
-static void rpccli_DRSUAPI_EXECUTE_KCC_done(struct tevent_req *subreq)
+static void rpccli_drsuapi_DsExecuteKCC_done(struct tevent_req *subreq)
 {
        struct tevent_req *req = tevent_req_callback_data(
                subreq, struct tevent_req);
-       struct rpccli_DRSUAPI_EXECUTE_KCC_state *state = tevent_req_data(
-               req, struct rpccli_DRSUAPI_EXECUTE_KCC_state);
+       struct rpccli_drsuapi_DsExecuteKCC_state *state = tevent_req_data(
+               req, struct rpccli_drsuapi_DsExecuteKCC_state);
        NTSTATUS status;
        TALLOC_CTX *mem_ctx;
 
@@ -3128,18 +3134,18 @@ static void rpccli_DRSUAPI_EXECUTE_KCC_done(struct tevent_req *subreq)
        ZERO_STRUCT(state->tmp);
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_OUT_DEBUG(DRSUAPI_EXECUTE_KCC, &state->orig);
+               NDR_PRINT_OUT_DEBUG(drsuapi_DsExecuteKCC, &state->orig);
        }
 
        tevent_req_done(req);
 }
 
-NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC_recv(struct tevent_req *req,
-                                        TALLOC_CTX *mem_ctx,
-                                        WERROR *result)
+NTSTATUS rpccli_drsuapi_DsExecuteKCC_recv(struct tevent_req *req,
+                                         TALLOC_CTX *mem_ctx,
+                                         WERROR *result)
 {
-       struct rpccli_DRSUAPI_EXECUTE_KCC_state *state = tevent_req_data(
-               req, struct rpccli_DRSUAPI_EXECUTE_KCC_state);
+       struct rpccli_drsuapi_DsExecuteKCC_state *state = tevent_req_data(
+               req, struct rpccli_drsuapi_DsExecuteKCC_state);
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
@@ -3157,23 +3163,29 @@ NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC_recv(struct tevent_req *req,
        return NT_STATUS_OK;
 }
 
-NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx,
-                                   WERROR *werror)
+NTSTATUS rpccli_drsuapi_DsExecuteKCC(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct policy_handle *bind_handle /* [in] [ref] */,
+                                    uint32_t level /* [in]  */,
+                                    union drsuapi_DsExecuteKCCRequest *req /* [in] [ref,switch_is(level)] */,
+                                    WERROR *werror)
 {
-       struct DRSUAPI_EXECUTE_KCC r;
+       struct drsuapi_DsExecuteKCC r;
        NTSTATUS status;
 
        /* In parameters */
+       r.in.bind_handle = bind_handle;
+       r.in.level = level;
+       r.in.req = req;
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_IN_DEBUG(DRSUAPI_EXECUTE_KCC, &r);
+               NDR_PRINT_IN_DEBUG(drsuapi_DsExecuteKCC, &r);
        }
 
        status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_drsuapi,
-                               NDR_DRSUAPI_EXECUTE_KCC,
+                               NDR_DRSUAPI_DSEXECUTEKCC,
                                &r);
 
        if (!NT_STATUS_IS_OK(status)) {
@@ -3181,7 +3193,7 @@ NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC(struct rpc_pipe_client *cli,
        }
 
        if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_OUT_DEBUG(DRSUAPI_EXECUTE_KCC, &r);
+               NDR_PRINT_OUT_DEBUG(drsuapi_DsExecuteKCC, &r);
        }
 
        if (NT_STATUS_IS_ERR(status)) {
index 0549bdfa7fbc5081eecbb8389a01ce3fd9eab31a..970e65e1ba8b6ba7e6b46514133edbe10647400c 100644 (file)
@@ -281,15 +281,21 @@ NTSTATUS rpccli_drsuapi_DsAddEntry(struct rpc_pipe_client *cli,
                                   int32_t *level_out /* [out] [ref] */,
                                   union drsuapi_DsAddEntryCtr *ctr /* [out] [ref,switch_is(*level_out)] */,
                                   WERROR *werror);
-struct tevent_req *rpccli_DRSUAPI_EXECUTE_KCC_send(TALLOC_CTX *mem_ctx,
-                                                  struct tevent_context *ev,
-                                                  struct rpc_pipe_client *cli);
-NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC_recv(struct tevent_req *req,
-                                        TALLOC_CTX *mem_ctx,
-                                        WERROR *result);
-NTSTATUS rpccli_DRSUAPI_EXECUTE_KCC(struct rpc_pipe_client *cli,
-                                   TALLOC_CTX *mem_ctx,
-                                   WERROR *werror);
+struct tevent_req *rpccli_drsuapi_DsExecuteKCC_send(TALLOC_CTX *mem_ctx,
+                                                   struct tevent_context *ev,
+                                                   struct rpc_pipe_client *cli,
+                                                   struct policy_handle *_bind_handle /* [in] [ref] */,
+                                                   uint32_t _level /* [in]  */,
+                                                   union drsuapi_DsExecuteKCCRequest *_req /* [in] [ref,switch_is(level)] */);
+NTSTATUS rpccli_drsuapi_DsExecuteKCC_recv(struct tevent_req *req,
+                                         TALLOC_CTX *mem_ctx,
+                                         WERROR *result);
+NTSTATUS rpccli_drsuapi_DsExecuteKCC(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct policy_handle *bind_handle /* [in] [ref] */,
+                                    uint32_t level /* [in]  */,
+                                    union drsuapi_DsExecuteKCCRequest *req /* [in] [ref,switch_is(level)] */,
+                                    WERROR *werror);
 struct tevent_req *rpccli_drsuapi_DsReplicaGetInfo_send(TALLOC_CTX *mem_ctx,
                                                        struct tevent_context *ev,
                                                        struct rpc_pipe_client *cli,
index 78834f6d28edc4fa465c7c3584118852c2cdfb31..5408cf49680def8a8562b597cac10787eb7518ab 100644 (file)
@@ -124,16 +124,16 @@ struct dcerpc_fault {
 enum dcerpc_AuthType
 #ifndef USE_UINT_ENUMS
  {
-       DCERPC_AUTH_TYPE_NONE=0,
-       DCERPC_AUTH_TYPE_KRB5_1=1,
-       DCERPC_AUTH_TYPE_SPNEGO=9,
-       DCERPC_AUTH_TYPE_NTLMSSP=10,
-       DCERPC_AUTH_TYPE_KRB5=16,
-       DCERPC_AUTH_TYPE_DPA=17,
-       DCERPC_AUTH_TYPE_MSN=18,
-       DCERPC_AUTH_TYPE_DIGEST=21,
-       DCERPC_AUTH_TYPE_SCHANNEL=68,
-       DCERPC_AUTH_TYPE_MSMQ=100
+       DCERPC_AUTH_TYPE_NONE=(int)(0),
+       DCERPC_AUTH_TYPE_KRB5_1=(int)(1),
+       DCERPC_AUTH_TYPE_SPNEGO=(int)(9),
+       DCERPC_AUTH_TYPE_NTLMSSP=(int)(10),
+       DCERPC_AUTH_TYPE_KRB5=(int)(16),
+       DCERPC_AUTH_TYPE_DPA=(int)(17),
+       DCERPC_AUTH_TYPE_MSN=(int)(18),
+       DCERPC_AUTH_TYPE_DIGEST=(int)(21),
+       DCERPC_AUTH_TYPE_SCHANNEL=(int)(68),
+       DCERPC_AUTH_TYPE_MSMQ=(int)(100)
 }
 #else
  { __donnot_use_enum_dcerpc_AuthType=0x7FFFFFFF}
@@ -153,12 +153,12 @@ enum dcerpc_AuthType
 enum dcerpc_AuthLevel
 #ifndef USE_UINT_ENUMS
  {
-       DCERPC_AUTH_LEVEL_NONE=1,
-       DCERPC_AUTH_LEVEL_CONNECT=2,
-       DCERPC_AUTH_LEVEL_CALL=3,
-       DCERPC_AUTH_LEVEL_PACKET=4,
-       DCERPC_AUTH_LEVEL_INTEGRITY=5,
-       DCERPC_AUTH_LEVEL_PRIVACY=6
+       DCERPC_AUTH_LEVEL_NONE=(int)(1),
+       DCERPC_AUTH_LEVEL_CONNECT=(int)(2),
+       DCERPC_AUTH_LEVEL_CALL=(int)(3),
+       DCERPC_AUTH_LEVEL_PACKET=(int)(4),
+       DCERPC_AUTH_LEVEL_INTEGRITY=(int)(5),
+       DCERPC_AUTH_LEVEL_PRIVACY=(int)(6)
 }
 #else
  { __donnot_use_enum_dcerpc_AuthLevel=0x7FFFFFFF}
@@ -236,26 +236,26 @@ struct dcerpc_working {
 enum dcerpc_pkt_type
 #ifndef USE_UINT_ENUMS
  {
-       DCERPC_PKT_REQUEST=0,
-       DCERPC_PKT_PING=1,
-       DCERPC_PKT_RESPONSE=2,
-       DCERPC_PKT_FAULT=3,
-       DCERPC_PKT_WORKING=4,
-       DCERPC_PKT_NOCALL=5,
-       DCERPC_PKT_REJECT=6,
-       DCERPC_PKT_ACK=7,
-       DCERPC_PKT_CL_CANCEL=8,
-       DCERPC_PKT_FACK=9,
-       DCERPC_PKT_CANCEL_ACK=10,
-       DCERPC_PKT_BIND=11,
-       DCERPC_PKT_BIND_ACK=12,
-       DCERPC_PKT_BIND_NAK=13,
-       DCERPC_PKT_ALTER=14,
-       DCERPC_PKT_ALTER_RESP=15,
-       DCERPC_PKT_AUTH3=16,
-       DCERPC_PKT_SHUTDOWN=17,
-       DCERPC_PKT_CO_CANCEL=18,
-       DCERPC_PKT_ORPHANED=19
+       DCERPC_PKT_REQUEST=(int)(0),
+       DCERPC_PKT_PING=(int)(1),
+       DCERPC_PKT_RESPONSE=(int)(2),
+       DCERPC_PKT_FAULT=(int)(3),
+       DCERPC_PKT_WORKING=(int)(4),
+       DCERPC_PKT_NOCALL=(int)(5),
+       DCERPC_PKT_REJECT=(int)(6),
+       DCERPC_PKT_ACK=(int)(7),
+       DCERPC_PKT_CL_CANCEL=(int)(8),
+       DCERPC_PKT_FACK=(int)(9),
+       DCERPC_PKT_CANCEL_ACK=(int)(10),
+       DCERPC_PKT_BIND=(int)(11),
+       DCERPC_PKT_BIND_ACK=(int)(12),
+       DCERPC_PKT_BIND_NAK=(int)(13),
+       DCERPC_PKT_ALTER=(int)(14),
+       DCERPC_PKT_ALTER_RESP=(int)(15),
+       DCERPC_PKT_AUTH3=(int)(16),
+       DCERPC_PKT_SHUTDOWN=(int)(17),
+       DCERPC_PKT_CO_CANCEL=(int)(18),
+       DCERPC_PKT_ORPHANED=(int)(19)
 }
 #else
  { __donnot_use_enum_dcerpc_pkt_type=0x7FFFFFFF}
index 41be3bd28d84b34cab08c1c8eaf72fd14cbee5e9..5fa273409457173afdc720259c7a82486db37000 100644 (file)
 enum dfs_ManagerVersion
 #ifndef USE_UINT_ENUMS
  {
-       DFS_MANAGER_VERSION_NT4=1,
-       DFS_MANAGER_VERSION_W2K=2,
-       DFS_MANAGER_VERSION_W2K3=4,
-       DFS_MANAGER_VERSION_W2K8=6
+       DFS_MANAGER_VERSION_NT4=(int)(1),
+       DFS_MANAGER_VERSION_W2K=(int)(2),
+       DFS_MANAGER_VERSION_W2K3=(int)(4),
+       DFS_MANAGER_VERSION_W2K8=(int)(6)
 }
 #else
  { __donnot_use_enum_dfs_ManagerVersion=0x7FFFFFFF}
@@ -99,12 +99,12 @@ struct dfs_Info5 {
 enum dfs_Target_PriorityClass
 #ifndef USE_UINT_ENUMS
  {
-       DFS_INVALID_PRIORITY_CLASS=-1,
-       DFS_SITE_COST_NORMAL_PRIORITY_CLASS=0,
-       DFS_GLOBAL_HIGH_PRIORITY_CLASS=1,
-       DFS_SITE_COST_HIGH_PRIORITY_CLASS=2,
-       DFS_SITE_COST_LOW_PRIORITY_CLASS=3,
-       DFS_GLOBAL_LOW_PRIORITY_CLASS=4
+       DFS_INVALID_PRIORITY_CLASS=(int)(-1),
+       DFS_SITE_COST_NORMAL_PRIORITY_CLASS=(int)(0),
+       DFS_GLOBAL_HIGH_PRIORITY_CLASS=(int)(1),
+       DFS_SITE_COST_HIGH_PRIORITY_CLASS=(int)(2),
+       DFS_SITE_COST_LOW_PRIORITY_CLASS=(int)(3),
+       DFS_GLOBAL_LOW_PRIORITY_CLASS=(int)(4)
 }
 #else
  { __donnot_use_enum_dfs_Target_PriorityClass=0x7FFFFFFF}
@@ -184,8 +184,8 @@ struct dfs_Info200 {
 enum dfs_VolumeFlavor
 #ifndef USE_UINT_ENUMS
  {
-       DFS_VOLUME_FLAVOR_STANDALONE=0x100,
-       DFS_VOLUME_FLAVOR_AD_BLOB=0x200
+       DFS_VOLUME_FLAVOR_STANDALONE=(int)(0x100),
+       DFS_VOLUME_FLAVOR_AD_BLOB=(int)(0x200)
 }
 #else
  { __donnot_use_enum_dfs_VolumeFlavor=0x7FFFFFFF}
index 190e012cb524687cdf646ac5ce478dbcf0f8f4a6..f7570af16fc5edba27f80e29101a24f2ce72035d 100644 (file)
@@ -110,7 +110,7 @@ struct partialAttributeSetBlob {
 enum prefixMapVersion
 #ifndef USE_UINT_ENUMS
  {
-       PREFIX_MAP_VERSION_DSDB=0x44534442
+       PREFIX_MAP_VERSION_DSDB=(int)(0x44534442)
 }
 #else
  { __donnot_use_enum_prefixMapVersion=0x7FFFFFFF}
@@ -159,7 +159,7 @@ struct supplementalCredentialsPackage {
 enum supplementalCredentialsSignature
 #ifndef USE_UINT_ENUMS
  {
-       SUPPLEMENTAL_CREDENTIALS_SIGNATURE=0x0050
+       SUPPLEMENTAL_CREDENTIALS_SIGNATURE=(int)(0x0050)
 }
 #else
  { __donnot_use_enum_supplementalCredentialsSignature=0x7FFFFFFF}
@@ -344,8 +344,8 @@ struct ExtendedErrorBlob {
 enum ExtendedErrorComputerNamePresent
 #ifndef USE_UINT_ENUMS
  {
-       EXTENDED_ERROR_COMPUTER_NAME_PRESENT=1,
-       EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT=2
+       EXTENDED_ERROR_COMPUTER_NAME_PRESENT=(int)(1),
+       EXTENDED_ERROR_COMPUTER_NAME_NOT_PRESENT=(int)(2)
 }
 #else
  { __donnot_use_enum_ExtendedErrorComputerNamePresent=0x7FFFFFFF}
@@ -366,13 +366,13 @@ struct ExtendedErrorComputerName {
 enum ExtendedErrorParamType
 #ifndef USE_UINT_ENUMS
  {
-       EXTENDED_ERROR_PARAM_TYPE_ASCII_STRING=1,
-       EXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING=2,
-       EXTENDED_ERROR_PARAM_TYPE_UINT32=3,
-       EXTENDED_ERROR_PARAM_TYPE_UINT16=4,
-       EXTENDED_ERROR_PARAM_TYPE_UINT64=5,
-       EXTENDED_ERROR_PARAM_TYPE_NONE=6,
-       EXTENDED_ERROR_PARAM_TYPE_BLOB=7
+       EXTENDED_ERROR_PARAM_TYPE_ASCII_STRING=(int)(1),
+       EXTENDED_ERROR_PARAM_TYPE_UNICODE_STRING=(int)(2),
+       EXTENDED_ERROR_PARAM_TYPE_UINT32=(int)(3),
+       EXTENDED_ERROR_PARAM_TYPE_UINT16=(int)(4),
+       EXTENDED_ERROR_PARAM_TYPE_UINT64=(int)(5),
+       EXTENDED_ERROR_PARAM_TYPE_NONE=(int)(6),
+       EXTENDED_ERROR_PARAM_TYPE_BLOB=(int)(7)
 }
 #else
  { __donnot_use_enum_ExtendedErrorParamType=0x7FFFFFFF}
index b7ebe4cbc6592f76b3cd9ee96f95caaad5f0197d..258c2731bd3ea36b782e07082746e5b1574044d0 100644 (file)
@@ -178,14 +178,14 @@ struct drsuapi_DsReplicaCursorCtrEx {
 enum drsuapi_DsExtendedOperation
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_EXOP_NONE=0x00000000,
-       DRSUAPI_EXOP_FSMO_REQ_ROLE=0x00000001,
-       DRSUAPI_EXOP_FSMO_RID_ALLOC=0x00000002,
-       DRSUAPI_EXOP_FSMO_RID_REQ_ROLE=0x00000003,
-       DRSUAPI_EXOP_FSMO_REQ_PDC=0x00000004,
-       DRSUAPI_EXOP_FSMO_ABANDON_ROLE=0x00000005,
-       DRSUAPI_EXOP_REPL_OBJ=0x00000006,
-       DRSUAPI_EXOP_REPL_SECRET=0x00000007
+       DRSUAPI_EXOP_NONE=(int)(0x00000000),
+       DRSUAPI_EXOP_FSMO_REQ_ROLE=(int)(0x00000001),
+       DRSUAPI_EXOP_FSMO_RID_ALLOC=(int)(0x00000002),
+       DRSUAPI_EXOP_FSMO_RID_REQ_ROLE=(int)(0x00000003),
+       DRSUAPI_EXOP_FSMO_REQ_PDC=(int)(0x00000004),
+       DRSUAPI_EXOP_FSMO_ABANDON_ROLE=(int)(0x00000005),
+       DRSUAPI_EXOP_REPL_OBJ=(int)(0x00000006),
+       DRSUAPI_EXOP_REPL_SECRET=(int)(0x00000007)
 }
 #else
  { __donnot_use_enum_drsuapi_DsExtendedOperation=0x7FFFFFFF}
@@ -203,23 +203,23 @@ enum drsuapi_DsExtendedOperation
 enum drsuapi_DsExtendedError
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_EXOP_ERR_NONE=0x00000000,
-       DRSUAPI_EXOP_ERR_SUCCESS=0x00000001,
-       DRSUAPI_EXOP_ERR_UNKNOWN_OP=0x00000002,
-       DRSUAPI_EXOP_ERR_FSMO_NOT_OWNER=0x00000003,
-       DRSUAPI_EXOP_ERR_UPDATE_ERR=0x00000004,
-       DRSUAPI_EXOP_ERR_EXCEPTION=0x00000005,
-       DRSUAPI_EXOP_ERR_UNKNOWN_CALLER=0x00000006,
-       DRSUAPI_EXOP_ERR_RID_ALLOC=0x00000007,
-       DRSUAPI_EXOP_ERR_FSMO_OWNER_DELETED=0x00000008,
-       DRSUAPI_EXOP_ERR_FMSO_PENDING_OP=0x00000009,
-       DRSUAPI_EXOP_ERR_MISMATCH=0x0000000A,
-       DRSUAPI_EXOP_ERR_COULDNT_CONTACT=0x0000000B,
-       DRSUAPI_EXOP_ERR_FSMO_REFUSING_ROLES=0x0000000C,
-       DRSUAPI_EXOP_ERR_DIR_ERROR=0x0000000D,
-       DRSUAPI_EXOP_ERR_FSMO_MISSING_SETTINGS=0x0000000E,
-       DRSUAPI_EXOP_ERR_ACCESS_DENIED=0x0000000F,
-       DRSUAPI_EXOP_ERR_PARAM_ERROR=0x00000010
+       DRSUAPI_EXOP_ERR_NONE=(int)(0x00000000),
+       DRSUAPI_EXOP_ERR_SUCCESS=(int)(0x00000001),
+       DRSUAPI_EXOP_ERR_UNKNOWN_OP=(int)(0x00000002),
+       DRSUAPI_EXOP_ERR_FSMO_NOT_OWNER=(int)(0x00000003),
+       DRSUAPI_EXOP_ERR_UPDATE_ERR=(int)(0x00000004),
+       DRSUAPI_EXOP_ERR_EXCEPTION=(int)(0x00000005),
+       DRSUAPI_EXOP_ERR_UNKNOWN_CALLER=(int)(0x00000006),
+       DRSUAPI_EXOP_ERR_RID_ALLOC=(int)(0x00000007),
+       DRSUAPI_EXOP_ERR_FSMO_OWNER_DELETED=(int)(0x00000008),
+       DRSUAPI_EXOP_ERR_FMSO_PENDING_OP=(int)(0x00000009),
+       DRSUAPI_EXOP_ERR_MISMATCH=(int)(0x0000000A),
+       DRSUAPI_EXOP_ERR_COULDNT_CONTACT=(int)(0x0000000B),
+       DRSUAPI_EXOP_ERR_FSMO_REFUSING_ROLES=(int)(0x0000000C),
+       DRSUAPI_EXOP_ERR_DIR_ERROR=(int)(0x0000000D),
+       DRSUAPI_EXOP_ERR_FSMO_MISSING_SETTINGS=(int)(0x0000000E),
+       DRSUAPI_EXOP_ERR_ACCESS_DENIED=(int)(0x0000000F),
+       DRSUAPI_EXOP_ERR_PARAM_ERROR=(int)(0x00000010)
 }
 #else
  { __donnot_use_enum_drsuapi_DsExtendedError=0x7FFFFFFF}
@@ -274,9 +274,9 @@ struct drsuapi_DsReplicaOIDMapping_Ctr {
 enum drsuapi_DsObjectClassId
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_OBJECTCLASS_top=0x00010000,
-       DRSUAPI_OBJECTCLASS_classSchema=0x0003000d,
-       DRSUAPI_OBJECTCLASS_attributeSchema=0x0003000e
+       DRSUAPI_OBJECTCLASS_top=(int)(0x00010000),
+       DRSUAPI_OBJECTCLASS_classSchema=(int)(0x0003000d),
+       DRSUAPI_OBJECTCLASS_attributeSchema=(int)(0x0003000e)
 }
 #else
  { __donnot_use_enum_drsuapi_DsObjectClassId=0x7FFFFFFF}
@@ -289,75 +289,75 @@ enum drsuapi_DsObjectClassId
 enum drsuapi_DsAttributeId
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_ATTRIBUTE_objectClass=0x00000000,
-       DRSUAPI_ATTRIBUTE_description=0x0000000d,
-       DRSUAPI_ATTRIBUTE_member=0x0000001f,
-       DRSUAPI_ATTRIBUTE_instanceType=0x00020001,
-       DRSUAPI_ATTRIBUTE_whenCreated=0x00020002,
-       DRSUAPI_ATTRIBUTE_possSuperiors=0x00020008,
-       DRSUAPI_ATTRIBUTE_hasMasterNCs=0x0002000e,
-       DRSUAPI_ATTRIBUTE_subClassOf=0x00020015,
-       DRSUAPI_ATTRIBUTE_governsID=0x00020016,
-       DRSUAPI_ATTRIBUTE_mustContain=0x00020018,
-       DRSUAPI_ATTRIBUTE_mayContain=0x00020019,
-       DRSUAPI_ATTRIBUTE_attributeID=0x0002001e,
-       DRSUAPI_ATTRIBUTE_attributeSyntax=0x00020020,
-       DRSUAPI_ATTRIBUTE_isSingleValued=0x00020021,
-       DRSUAPI_ATTRIBUTE_rangeLower=0x00020022,
-       DRSUAPI_ATTRIBUTE_rangeUpper=0x00020023,
-       DRSUAPI_ATTRIBUTE_dMDLocation=0x00020024,
-       DRSUAPI_ATTRIBUTE_objectVersion=0x0002004c,
-       DRSUAPI_ATTRIBUTE_invocationId=0x00020073,
-       DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly=0x000200a9,
-       DRSUAPI_ATTRIBUTE_adminDisplayName=0x000200c2,
-       DRSUAPI_ATTRIBUTE_adminDescription=0x000200e2,
-       DRSUAPI_ATTRIBUTE_oMSyntax=0x000200e7,
-       DRSUAPI_ATTRIBUTE_ntSecurityDescriptor=0x00020119,
-       DRSUAPI_ATTRIBUTE_searchFlags=0x0002014e,
-       DRSUAPI_ATTRIBUTE_auxiliaryClass=0x0002015f,
-       DRSUAPI_ATTRIBUTE_lDAPDisplayName=0x000201cc,
-       DRSUAPI_ATTRIBUTE_name=0x00090001,
-       DRSUAPI_ATTRIBUTE_userAccountControl=0x00090008,
-       DRSUAPI_ATTRIBUTE_currentValue=0x0009001b,
-       DRSUAPI_ATTRIBUTE_homeDirectory=0x0009002c,
-       DRSUAPI_ATTRIBUTE_homeDrive=0x0009002d,
-       DRSUAPI_ATTRIBUTE_scriptPath=0x0009003e,
-       DRSUAPI_ATTRIBUTE_profilePath=0x0009008b,
-       DRSUAPI_ATTRIBUTE_objectSid=0x00090092,
-       DRSUAPI_ATTRIBUTE_schemaIDGUID=0x00090094,
-       DRSUAPI_ATTRIBUTE_dBCSPwd=0x00090037,
-       DRSUAPI_ATTRIBUTE_logonHours=0x00090040,
-       DRSUAPI_ATTRIBUTE_userWorkstations=0x00090056,
-       DRSUAPI_ATTRIBUTE_unicodePwd=0x0009005a,
-       DRSUAPI_ATTRIBUTE_ntPwdHistory=0x0009005e,
-       DRSUAPI_ATTRIBUTE_priorValue=0x00090064,
-       DRSUAPI_ATTRIBUTE_supplementalCredentials=0x0009007d,
-       DRSUAPI_ATTRIBUTE_trustAuthIncoming=0x00090081,
-       DRSUAPI_ATTRIBUTE_trustAuthOutgoing=0x00090087,
-       DRSUAPI_ATTRIBUTE_lmPwdHistory=0x000900a0,
-       DRSUAPI_ATTRIBUTE_systemPossSuperiors=0x000900c3,
-       DRSUAPI_ATTRIBUTE_systemMayContain=0x000900c4,
-       DRSUAPI_ATTRIBUTE_systemMustContain=0x000900c5,
-       DRSUAPI_ATTRIBUTE_sAMAccountName=0x000900dd,
-       DRSUAPI_ATTRIBUTE_sAMAccountType=0x0009012e,
-       DRSUAPI_ATTRIBUTE_fSMORoleOwner=0x00090171,
-       DRSUAPI_ATTRIBUTE_systemFlags=0x00090177,
-       DRSUAPI_ATTRIBUTE_serverReference=0x00090203,
-       DRSUAPI_ATTRIBUTE_serverReferenceBL=0x00090204,
-       DRSUAPI_ATTRIBUTE_initialAuthIncoming=0x0009021b,
-       DRSUAPI_ATTRIBUTE_initialAuthOutgoing=0x0009021c,
-       DRSUAPI_ATTRIBUTE_wellKnownObjects=0x0009026a,
-       DRSUAPI_ATTRIBUTE_dNSHostName=0x0009026b,
-       DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet=0x0009027f,
-       DRSUAPI_ATTRIBUTE_userPrincipalName=0x00090290,
-       DRSUAPI_ATTRIBUTE_groupType=0x000902ee,
-       DRSUAPI_ATTRIBUTE_servicePrincipalName=0x00090303,
-       DRSUAPI_ATTRIBUTE_objectCategory=0x0009030e,
-       DRSUAPI_ATTRIBUTE_gPLink=0x0009037b,
-       DRSUAPI_ATTRIBUTE_msDS_Behavior_Version=0x000905b3,
-       DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber=0x000906f6,
-       DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs=0x0009071c,
-       DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs=0x0009072c
+       DRSUAPI_ATTRIBUTE_objectClass=(int)(0x00000000),
+       DRSUAPI_ATTRIBUTE_description=(int)(0x0000000d),
+       DRSUAPI_ATTRIBUTE_member=(int)(0x0000001f),
+       DRSUAPI_ATTRIBUTE_instanceType=(int)(0x00020001),
+       DRSUAPI_ATTRIBUTE_whenCreated=(int)(0x00020002),
+       DRSUAPI_ATTRIBUTE_possSuperiors=(int)(0x00020008),
+       DRSUAPI_ATTRIBUTE_hasMasterNCs=(int)(0x0002000e),
+       DRSUAPI_ATTRIBUTE_subClassOf=(int)(0x00020015),
+       DRSUAPI_ATTRIBUTE_governsID=(int)(0x00020016),
+       DRSUAPI_ATTRIBUTE_mustContain=(int)(0x00020018),
+       DRSUAPI_ATTRIBUTE_mayContain=(int)(0x00020019),
+       DRSUAPI_ATTRIBUTE_attributeID=(int)(0x0002001e),
+       DRSUAPI_ATTRIBUTE_attributeSyntax=(int)(0x00020020),
+       DRSUAPI_ATTRIBUTE_isSingleValued=(int)(0x00020021),
+       DRSUAPI_ATTRIBUTE_rangeLower=(int)(0x00020022),
+       DRSUAPI_ATTRIBUTE_rangeUpper=(int)(0x00020023),
+       DRSUAPI_ATTRIBUTE_dMDLocation=(int)(0x00020024),
+       DRSUAPI_ATTRIBUTE_objectVersion=(int)(0x0002004c),
+       DRSUAPI_ATTRIBUTE_invocationId=(int)(0x00020073),
+       DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly=(int)(0x000200a9),
+       DRSUAPI_ATTRIBUTE_adminDisplayName=(int)(0x000200c2),
+       DRSUAPI_ATTRIBUTE_adminDescription=(int)(0x000200e2),
+       DRSUAPI_ATTRIBUTE_oMSyntax=(int)(0x000200e7),
+       DRSUAPI_ATTRIBUTE_ntSecurityDescriptor=(int)(0x00020119),
+       DRSUAPI_ATTRIBUTE_searchFlags=(int)(0x0002014e),
+       DRSUAPI_ATTRIBUTE_auxiliaryClass=(int)(0x0002015f),
+       DRSUAPI_ATTRIBUTE_lDAPDisplayName=(int)(0x000201cc),
+       DRSUAPI_ATTRIBUTE_name=(int)(0x00090001),
+       DRSUAPI_ATTRIBUTE_userAccountControl=(int)(0x00090008),
+       DRSUAPI_ATTRIBUTE_currentValue=(int)(0x0009001b),
+       DRSUAPI_ATTRIBUTE_homeDirectory=(int)(0x0009002c),
+       DRSUAPI_ATTRIBUTE_homeDrive=(int)(0x0009002d),
+       DRSUAPI_ATTRIBUTE_scriptPath=(int)(0x0009003e),
+       DRSUAPI_ATTRIBUTE_profilePath=(int)(0x0009008b),
+       DRSUAPI_ATTRIBUTE_objectSid=(int)(0x00090092),
+       DRSUAPI_ATTRIBUTE_schemaIDGUID=(int)(0x00090094),
+       DRSUAPI_ATTRIBUTE_dBCSPwd=(int)(0x00090037),
+       DRSUAPI_ATTRIBUTE_logonHours=(int)(0x00090040),
+       DRSUAPI_ATTRIBUTE_userWorkstations=(int)(0x00090056),
+       DRSUAPI_ATTRIBUTE_unicodePwd=(int)(0x0009005a),
+       DRSUAPI_ATTRIBUTE_ntPwdHistory=(int)(0x0009005e),
+       DRSUAPI_ATTRIBUTE_priorValue=(int)(0x00090064),
+       DRSUAPI_ATTRIBUTE_supplementalCredentials=(int)(0x0009007d),
+       DRSUAPI_ATTRIBUTE_trustAuthIncoming=(int)(0x00090081),
+       DRSUAPI_ATTRIBUTE_trustAuthOutgoing=(int)(0x00090087),
+       DRSUAPI_ATTRIBUTE_lmPwdHistory=(int)(0x000900a0),
+       DRSUAPI_ATTRIBUTE_systemPossSuperiors=(int)(0x000900c3),
+       DRSUAPI_ATTRIBUTE_systemMayContain=(int)(0x000900c4),
+       DRSUAPI_ATTRIBUTE_systemMustContain=(int)(0x000900c5),
+       DRSUAPI_ATTRIBUTE_sAMAccountName=(int)(0x000900dd),
+       DRSUAPI_ATTRIBUTE_sAMAccountType=(int)(0x0009012e),
+       DRSUAPI_ATTRIBUTE_fSMORoleOwner=(int)(0x00090171),
+       DRSUAPI_ATTRIBUTE_systemFlags=(int)(0x00090177),
+       DRSUAPI_ATTRIBUTE_serverReference=(int)(0x00090203),
+       DRSUAPI_ATTRIBUTE_serverReferenceBL=(int)(0x00090204),
+       DRSUAPI_ATTRIBUTE_initialAuthIncoming=(int)(0x0009021b),
+       DRSUAPI_ATTRIBUTE_initialAuthOutgoing=(int)(0x0009021c),
+       DRSUAPI_ATTRIBUTE_wellKnownObjects=(int)(0x0009026a),
+       DRSUAPI_ATTRIBUTE_dNSHostName=(int)(0x0009026b),
+       DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet=(int)(0x0009027f),
+       DRSUAPI_ATTRIBUTE_userPrincipalName=(int)(0x00090290),
+       DRSUAPI_ATTRIBUTE_groupType=(int)(0x000902ee),
+       DRSUAPI_ATTRIBUTE_servicePrincipalName=(int)(0x00090303),
+       DRSUAPI_ATTRIBUTE_objectCategory=(int)(0x0009030e),
+       DRSUAPI_ATTRIBUTE_gPLink=(int)(0x0009037b),
+       DRSUAPI_ATTRIBUTE_msDS_Behavior_Version=(int)(0x000905b3),
+       DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber=(int)(0x000906f6),
+       DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs=(int)(0x0009071c),
+       DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs=(int)(0x0009072c)
 }
 #else
  { __donnot_use_enum_drsuapi_DsAttributeId=0x7FFFFFFF}
@@ -456,9 +456,27 @@ struct drsuapi_DsGetNCChangesRequest8 {
        struct drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
 };
 
+struct drsuapi_DsGetNCChangesRequest10 {
+       struct GUID destination_dsa_guid;
+       struct GUID source_dsa_invocation_id;
+       struct drsuapi_DsReplicaObjectIdentifier *naming_context;/* [ref] */
+       struct drsuapi_DsReplicaHighWaterMark highwatermark;
+       struct drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;/* [unique] */
+       uint32_t replica_flags;
+       uint32_t max_object_count;
+       uint32_t max_ndr_size;
+       enum drsuapi_DsExtendedOperation extended_op;
+       uint64_t fsmo_info;
+       struct drsuapi_DsPartialAttributeSet *partial_attribute_set;/* [unique] */
+       struct drsuapi_DsPartialAttributeSet *partial_attribute_set_ex;/* [unique] */
+       struct drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr;
+       uint32_t more_flags;
+};
+
 union drsuapi_DsGetNCChangesRequest {
        struct drsuapi_DsGetNCChangesRequest5 req5;/* [case(5)] */
        struct drsuapi_DsGetNCChangesRequest8 req8;/* [case(8)] */
+       struct drsuapi_DsGetNCChangesRequest10 req10;/* [case(10)] */
 }/* [switch_type(int32)] */;
 
 struct drsuapi_DsReplicaCursor2 {
@@ -628,8 +646,8 @@ struct drsuapi_DsGetNCChangesXPRESSCtr6 {
 enum drsuapi_DsGetNCChangesCompressionType
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_COMPRESSION_TYPE_MSZIP=2,
-       DRSUAPI_COMPRESSION_TYPE_XPRESS=3
+       DRSUAPI_COMPRESSION_TYPE_MSZIP=(int)(2),
+       DRSUAPI_COMPRESSION_TYPE_XPRESS=(int)(3)
 }
 #else
  { __donnot_use_enum_drsuapi_DsGetNCChangesCompressionType=0x7FFFFFFF}
@@ -740,13 +758,13 @@ union drsuapi_DsReplicaModRequest {
 enum drsuapi_DsMembershipType
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS=1,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS=2,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS=3,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS2=4,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_GROUPS=5,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_GROUPMEMBERS=6,
-       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS2=7
+       DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_AND_DOMAIN_GROUPS=(int)(1),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS=(int)(2),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS=(int)(3),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_LOCAL_GROUPS2=(int)(4),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_UNIVERSAL_GROUPS=(int)(5),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_GROUPMEMBERS=(int)(6),
+       DRSUAPI_DS_MEMBERSHIP_TYPE_DOMAIN_GROUPS2=(int)(7)
 }
 #else
  { __donnot_use_enum_drsuapi_DsMembershipType=0x7FFFFFFF}
@@ -817,14 +835,14 @@ union drsuapi_DsGetNT4ChangeLogInfo {
 enum drsuapi_DsNameStatus
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_NAME_STATUS_OK=0,
-       DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR=1,
-       DRSUAPI_DS_NAME_STATUS_NOT_FOUND=2,
-       DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE=3,
-       DRSUAPI_DS_NAME_STATUS_NO_MAPPING=4,
-       DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY=5,
-       DRSUAPI_DS_NAME_STATUS_NO_SYNTACTICAL_MAPPING=6,
-       DRSUAPI_DS_NAME_STATUS_TRUST_REFERRAL=7
+       DRSUAPI_DS_NAME_STATUS_OK=(int)(0),
+       DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR=(int)(1),
+       DRSUAPI_DS_NAME_STATUS_NOT_FOUND=(int)(2),
+       DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE=(int)(3),
+       DRSUAPI_DS_NAME_STATUS_NO_MAPPING=(int)(4),
+       DRSUAPI_DS_NAME_STATUS_DOMAIN_ONLY=(int)(5),
+       DRSUAPI_DS_NAME_STATUS_NO_SYNTACTICAL_MAPPING=(int)(6),
+       DRSUAPI_DS_NAME_STATUS_TRUST_REFERRAL=(int)(7)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameStatus=0x7FFFFFFF}
@@ -842,11 +860,11 @@ enum drsuapi_DsNameStatus
 enum drsuapi_DsNameFlags
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_NAME_FLAG_NO_FLAGS=0x0,
-       DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY=0x1,
-       DRSUAPI_DS_NAME_FLAG_EVAL_AT_DC=0x2,
-       DRSUAPI_DS_NAME_FLAG_GCVERIFY=0x4,
-       DRSUAPI_DS_NAME_FLAG_TRUST_REFERRAL=0x8
+       DRSUAPI_DS_NAME_FLAG_NO_FLAGS=(int)(0x0),
+       DRSUAPI_DS_NAME_FLAG_SYNTACTICAL_ONLY=(int)(0x1),
+       DRSUAPI_DS_NAME_FLAG_EVAL_AT_DC=(int)(0x2),
+       DRSUAPI_DS_NAME_FLAG_GCVERIFY=(int)(0x4),
+       DRSUAPI_DS_NAME_FLAG_TRUST_REFERRAL=(int)(0x8)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameFlags=0x7FFFFFFF}
@@ -861,17 +879,17 @@ enum drsuapi_DsNameFlags
 enum drsuapi_DsNameFormat
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_NAME_FORMAT_UNKNOWN=0,
-       DRSUAPI_DS_NAME_FORMAT_FQDN_1779=1,
-       DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT=2,
-       DRSUAPI_DS_NAME_FORMAT_DISPLAY=3,
-       DRSUAPI_DS_NAME_FORMAT_GUID=6,
-       DRSUAPI_DS_NAME_FORMAT_CANONICAL=7,
-       DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL=8,
-       DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX=9,
-       DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL=10,
-       DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY=11,
-       DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN=12
+       DRSUAPI_DS_NAME_FORMAT_UNKNOWN=(int)(0),
+       DRSUAPI_DS_NAME_FORMAT_FQDN_1779=(int)(1),
+       DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT=(int)(2),
+       DRSUAPI_DS_NAME_FORMAT_DISPLAY=(int)(3),
+       DRSUAPI_DS_NAME_FORMAT_GUID=(int)(6),
+       DRSUAPI_DS_NAME_FORMAT_CANONICAL=(int)(7),
+       DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL=(int)(8),
+       DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX=(int)(9),
+       DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL=(int)(10),
+       DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY=(int)(11),
+       DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN=(int)(12)
 }
 #else
  { __donnot_use_enum_drsuapi_DsNameFormat=0x7FFFFFFF}
@@ -925,9 +943,9 @@ union drsuapi_DsNameCtr {
 enum drsuapi_DsSpnOperation
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_SPN_OPERATION_ADD=0,
-       DRSUAPI_DS_SPN_OPERATION_REPLACE=1,
-       DRSUAPI_DS_SPN_OPERATION_DELETE=2
+       DRSUAPI_DS_SPN_OPERATION_ADD=(int)(0),
+       DRSUAPI_DS_SPN_OPERATION_REPLACE=(int)(1),
+       DRSUAPI_DS_SPN_OPERATION_DELETE=(int)(2)
 }
 #else
  { __donnot_use_enum_drsuapi_DsSpnOperation=0x7FFFFFFF}
@@ -1062,10 +1080,10 @@ struct drsuapi_DsGetDCConnectionCtr01 {
 enum drsuapi_DsGetDCInfoCtrLevels
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DC_INFO_CTR_1=1,
-       DRSUAPI_DC_INFO_CTR_2=2,
-       DRSUAPI_DC_INFO_CTR_3=3,
-       DRSUAPI_DC_CONNECTION_CTR_01=-1
+       DRSUAPI_DC_INFO_CTR_1=(int)(1),
+       DRSUAPI_DC_INFO_CTR_2=(int)(2),
+       DRSUAPI_DC_INFO_CTR_3=(int)(3),
+       DRSUAPI_DC_CONNECTION_CTR_01=(int)(-1)
 }
 #else
  { __donnot_use_enum_drsuapi_DsGetDCInfoCtrLevels=0x7FFFFFFF}
@@ -1167,11 +1185,24 @@ union drsuapi_DsAddEntryCtr {
        struct drsuapi_DsAddEntryCtr3 ctr3;/* [case(3)] */
 }/* [switch_type(int32)] */;
 
+/* bitmap drsuapi_DsExecuteKCCFlags */
+#define DRSUAPI_DS_EXECUTE_KCC_ASYNCHRONOUS_OPERATION ( 0x00000001 )
+#define DRSUAPI_DS_EXECUTE_KCC_DAMPED ( 0x00000002 )
+
+struct drsuapi_DsExecuteKCC1 {
+       uint32_t taskID;
+       uint32_t flags;
+};
+
+union drsuapi_DsExecuteKCCRequest {
+       struct drsuapi_DsExecuteKCC1 ctr1;/* [case] */
+}/* [switch_type(uint32)] */;
+
 enum drsuapi_DsReplicaGetInfoLevel
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_REPLICA_GET_INFO=1,
-       DRSUAPI_DS_REPLICA_GET_INFO2=2
+       DRSUAPI_DS_REPLICA_GET_INFO=(int)(1),
+       DRSUAPI_DS_REPLICA_GET_INFO2=(int)(2)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaGetInfoLevel=0x7FFFFFFF}
@@ -1183,21 +1214,21 @@ enum drsuapi_DsReplicaGetInfoLevel
 enum drsuapi_DsReplicaInfoType
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS=0,
-       DRSUAPI_DS_REPLICA_INFO_CURSORS=1,
-       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA=2,
-       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES=3,
-       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES=4,
-       DRSUAPI_DS_REPLICA_INFO_PENDING_OPS=5,
-       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA=6,
-       DRSUAPI_DS_REPLICA_INFO_CURSORS2=7,
-       DRSUAPI_DS_REPLICA_INFO_CURSORS3=8,
-       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2=9,
-       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2=10,
-       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02=-2,
-       DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04=-4,
-       DRSUAPI_DS_REPLICA_INFO_CURSORS05=-5,
-       DRSUAPI_DS_REPLICA_INFO_06=-6
+       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS=(int)(0),
+       DRSUAPI_DS_REPLICA_INFO_CURSORS=(int)(1),
+       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA=(int)(2),
+       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES=(int)(3),
+       DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES=(int)(4),
+       DRSUAPI_DS_REPLICA_INFO_PENDING_OPS=(int)(5),
+       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA=(int)(6),
+       DRSUAPI_DS_REPLICA_INFO_CURSORS2=(int)(7),
+       DRSUAPI_DS_REPLICA_INFO_CURSORS3=(int)(8),
+       DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2=(int)(9),
+       DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2=(int)(10),
+       DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02=(int)(-2),
+       DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04=(int)(-4),
+       DRSUAPI_DS_REPLICA_INFO_CURSORS05=(int)(-5),
+       DRSUAPI_DS_REPLICA_INFO_06=(int)(-6)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaInfoType=0x7FFFFFFF}
@@ -1303,11 +1334,11 @@ struct drsuapi_DsReplicaKccDsaFailuresCtr {
 enum drsuapi_DsReplicaOpType
 #ifndef USE_UINT_ENUMS
  {
-       DRSUAPI_DS_REPLICA_OP_TYPE_SYNC=0,
-       DRSUAPI_DS_REPLICA_OP_TYPE_ADD=1,
-       DRSUAPI_DS_REPLICA_OP_TYPE_DELETE=2,
-       DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY=3,
-       DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS=4
+       DRSUAPI_DS_REPLICA_OP_TYPE_SYNC=(int)(0),
+       DRSUAPI_DS_REPLICA_OP_TYPE_ADD=(int)(1),
+       DRSUAPI_DS_REPLICA_OP_TYPE_DELETE=(int)(2),
+       DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY=(int)(3),
+       DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS=(int)(4)
 }
 #else
  { __donnot_use_enum_drsuapi_DsReplicaOpType=0x7FFFFFFF}
@@ -1769,7 +1800,13 @@ struct drsuapi_DsAddEntry {
 };
 
 
-struct DRSUAPI_EXECUTE_KCC {
+struct drsuapi_DsExecuteKCC {
+       struct {
+               struct policy_handle *bind_handle;/* [ref] */
+               uint32_t level;
+               union drsuapi_DsExecuteKCCRequest *req;/* [ref,switch_is(level)] */
+       } in;
+
        struct {
                WERROR result;
        } out;
index 5d254fe92e6bbb275cf9b11c525d83442a6220dc..f1d1332c6a278c5f3da1035c03f99ea9a7dd9370 100644 (file)
 enum dssetup_DsRole
 #ifndef USE_UINT_ENUMS
  {
-       DS_ROLE_STANDALONE_WORKSTATION=0,
-       DS_ROLE_MEMBER_WORKSTATION=1,
-       DS_ROLE_STANDALONE_SERVER=2,
-       DS_ROLE_MEMBER_SERVER=3,
-       DS_ROLE_BACKUP_DC=4,
-       DS_ROLE_PRIMARY_DC=5
+       DS_ROLE_STANDALONE_WORKSTATION=(int)(0),
+       DS_ROLE_MEMBER_WORKSTATION=(int)(1),
+       DS_ROLE_STANDALONE_SERVER=(int)(2),
+       DS_ROLE_MEMBER_SERVER=(int)(3),
+       DS_ROLE_BACKUP_DC=(int)(4),
+       DS_ROLE_PRIMARY_DC=(int)(5)
 }
 #else
  { __donnot_use_enum_dssetup_DsRole=0x7FFFFFFF}
@@ -47,8 +47,8 @@ struct dssetup_DsRolePrimaryDomInfoBasic {
 enum dssetup_DsUpgrade
 #ifndef USE_UINT_ENUMS
  {
-       DS_ROLE_NOT_UPGRADING=0,
-       DS_ROLE_UPGRADING=1
+       DS_ROLE_NOT_UPGRADING=(int)(0),
+       DS_ROLE_UPGRADING=(int)(1)
 }
 #else
  { __donnot_use_enum_dssetup_DsUpgrade=0x7FFFFFFF}
@@ -60,9 +60,9 @@ enum dssetup_DsUpgrade
 enum dssetup_DsPrevious
 #ifndef USE_UINT_ENUMS
  {
-       DS_ROLE_PREVIOUS_UNKNOWN=0,
-       DS_ROLE_PREVIOUS_PRIMARY=1,
-       DS_ROLE_PREVIOUS_BACKUP=2
+       DS_ROLE_PREVIOUS_UNKNOWN=(int)(0),
+       DS_ROLE_PREVIOUS_PRIMARY=(int)(1),
+       DS_ROLE_PREVIOUS_BACKUP=(int)(2)
 }
 #else
  { __donnot_use_enum_dssetup_DsPrevious=0x7FFFFFFF}
@@ -80,9 +80,9 @@ struct dssetup_DsRoleUpgradeStatus {
 enum dssetup_DsRoleOp
 #ifndef USE_UINT_ENUMS
  {
-       DS_ROLE_OP_IDLE=0,
-       DS_ROLE_OP_ACTIVE=1,
-       DS_ROLE_OP_NEEDS_REBOOT=2
+       DS_ROLE_OP_IDLE=(int)(0),
+       DS_ROLE_OP_ACTIVE=(int)(1),
+       DS_ROLE_OP_NEEDS_REBOOT=(int)(2)
 }
 #else
  { __donnot_use_enum_dssetup_DsRoleOp=0x7FFFFFFF}
@@ -99,9 +99,9 @@ struct dssetup_DsRoleOpStatus {
 enum dssetup_DsRoleInfoLevel
 #ifndef USE_UINT_ENUMS
  {
-       DS_ROLE_BASIC_INFORMATION=1,
-       DS_ROLE_UPGRADE_STATUS=2,
-       DS_ROLE_OP_STATUS=3
+       DS_ROLE_BASIC_INFORMATION=(int)(1),
+       DS_ROLE_UPGRADE_STATUS=(int)(2),
+       DS_ROLE_OP_STATUS=(int)(3)
 }
 #else
  { __donnot_use_enum_dssetup_DsRoleInfoLevel=0x7FFFFFFF}
index 9c783046f3b74d2fb245edf6674ab57900563157..53c6ee73f742f5cbf3dd902603d921eee8009339 100644 (file)
@@ -51,8 +51,8 @@ union echo_Info {
 enum echo_Enum1
 #ifndef USE_UINT_ENUMS
  {
-       ECHO_ENUM1=1,
-       ECHO_ENUM2=2
+       ECHO_ENUM1=(int)(1),
+       ECHO_ENUM2=(int)(2)
 }
 #else
  { __donnot_use_enum_echo_Enum1=0x7FFFFFFF}
@@ -64,8 +64,8 @@ enum echo_Enum1
 enum echo_Enum1_32
 #ifndef USE_UINT_ENUMS
  {
-       ECHO_ENUM1_32=1,
-       ECHO_ENUM2_32=2
+       ECHO_ENUM1_32=(int)(1),
+       ECHO_ENUM2_32=(int)(2)
 }
 #else
  { __donnot_use_enum_echo_Enum1_32=0x7FFFFFFF}
index 2030e1e54f042b3503870b91a5af8395d06f0e00..3d004116554189451e8fe17c558407b91dbd93cc 100644 (file)
 enum epm_protocol
 #ifndef USE_UINT_ENUMS
  {
-       EPM_PROTOCOL_DNET_NSP=0x04,
-       EPM_PROTOCOL_OSI_TP4=0x05,
-       EPM_PROTOCOL_OSI_CLNS=0x06,
-       EPM_PROTOCOL_TCP=0x07,
-       EPM_PROTOCOL_UDP=0x08,
-       EPM_PROTOCOL_IP=0x09,
-       EPM_PROTOCOL_NCADG=0x0a,
-       EPM_PROTOCOL_NCACN=0x0b,
-       EPM_PROTOCOL_NCALRPC=0x0c,
-       EPM_PROTOCOL_UUID=0x0d,
-       EPM_PROTOCOL_IPX=0x0e,
-       EPM_PROTOCOL_SMB=0x0f,
-       EPM_PROTOCOL_NAMED_PIPE=0x10,
-       EPM_PROTOCOL_NETBIOS=0x11,
-       EPM_PROTOCOL_NETBEUI=0x12,
-       EPM_PROTOCOL_SPX=0x13,
-       EPM_PROTOCOL_NB_IPX=0x14,
-       EPM_PROTOCOL_DSP=0x16,
-       EPM_PROTOCOL_DDP=0x17,
-       EPM_PROTOCOL_APPLETALK=0x18,
-       EPM_PROTOCOL_VINES_SPP=0x1a,
-       EPM_PROTOCOL_VINES_IPC=0x1b,
-       EPM_PROTOCOL_STREETTALK=0x1c,
-       EPM_PROTOCOL_HTTP=0x1f,
-       EPM_PROTOCOL_UNIX_DS=0x20,
-       EPM_PROTOCOL_NULL=0x21
+       EPM_PROTOCOL_DNET_NSP=(int)(0x04),
+       EPM_PROTOCOL_OSI_TP4=(int)(0x05),
+       EPM_PROTOCOL_OSI_CLNS=(int)(0x06),
+       EPM_PROTOCOL_TCP=(int)(0x07),
+       EPM_PROTOCOL_UDP=(int)(0x08),
+       EPM_PROTOCOL_IP=(int)(0x09),
+       EPM_PROTOCOL_NCADG=(int)(0x0a),
+       EPM_PROTOCOL_NCACN=(int)(0x0b),
+       EPM_PROTOCOL_NCALRPC=(int)(0x0c),
+       EPM_PROTOCOL_UUID=(int)(0x0d),
+       EPM_PROTOCOL_IPX=(int)(0x0e),
+       EPM_PROTOCOL_SMB=(int)(0x0f),
+       EPM_PROTOCOL_NAMED_PIPE=(int)(0x10),
+       EPM_PROTOCOL_NETBIOS=(int)(0x11),
+       EPM_PROTOCOL_NETBEUI=(int)(0x12),
+       EPM_PROTOCOL_SPX=(int)(0x13),
+       EPM_PROTOCOL_NB_IPX=(int)(0x14),
+       EPM_PROTOCOL_DSP=(int)(0x16),
+       EPM_PROTOCOL_DDP=(int)(0x17),
+       EPM_PROTOCOL_APPLETALK=(int)(0x18),
+       EPM_PROTOCOL_VINES_SPP=(int)(0x1a),
+       EPM_PROTOCOL_VINES_IPC=(int)(0x1b),
+       EPM_PROTOCOL_STREETTALK=(int)(0x1c),
+       EPM_PROTOCOL_HTTP=(int)(0x1f),
+       EPM_PROTOCOL_UNIX_DS=(int)(0x20),
+       EPM_PROTOCOL_NULL=(int)(0x21)
 }
 #else
  { __donnot_use_enum_epm_protocol=0x7FFFFFFF}
index 3895017d94898a8061b0734f08cac6c58807c6c2..dc2e8770299059944a75cf201042dc69ed4c7da0 100644 (file)
 enum eventlogEventTypes
 #ifndef USE_UINT_ENUMS
  {
-       EVENTLOG_SUCCESS=0x0000,
-       EVENTLOG_ERROR_TYPE=0x0001,
-       EVENTLOG_WARNING_TYPE=0x0002,
-       EVENTLOG_INFORMATION_TYPE=0x0004,
-       EVENTLOG_AUDIT_SUCCESS=0x0008,
-       EVENTLOG_AUDIT_FAILURE=0x0010
+       EVENTLOG_SUCCESS=(int)(0x0000),
+       EVENTLOG_ERROR_TYPE=(int)(0x0001),
+       EVENTLOG_WARNING_TYPE=(int)(0x0002),
+       EVENTLOG_INFORMATION_TYPE=(int)(0x0004),
+       EVENTLOG_AUDIT_SUCCESS=(int)(0x0008),
+       EVENTLOG_AUDIT_FAILURE=(int)(0x0010)
 }
 #else
  { __donnot_use_enum_eventlogEventTypes=0x7FFFFFFF}
@@ -73,10 +73,10 @@ struct eventlog_Record_tdb {
 enum EVENTLOG_HEADER_FLAGS
 #ifndef USE_UINT_ENUMS
  {
-       ELF_LOGFILE_HEADER_DIRTY=0x0001,
-       ELF_LOGFILE_HEADER_WRAP=0x0002,
-       ELF_LOGFILE_LOGFULL_WRITTEN=0x0004,
-       ELF_LOGFILE_ARCHIVE_SET=0x0008
+       ELF_LOGFILE_HEADER_DIRTY=(int)(0x0001),
+       ELF_LOGFILE_HEADER_WRAP=(int)(0x0002),
+       ELF_LOGFILE_LOGFULL_WRITTEN=(int)(0x0004),
+       ELF_LOGFILE_ARCHIVE_SET=(int)(0x0008)
 }
 #else
  { __donnot_use_enum_EVENTLOG_HEADER_FLAGS=0x7FFFFFFF}
index d9b89ad2aca20c468ca90ef69beec5c48d39b633..41fb62c18a6128195c06db583a326eccaac9ab91 100644 (file)
 enum initshutdown_ReasonMajor
 #ifndef USE_UINT_ENUMS
  {
-       SHTDN_REASON_MAJOR_OTHER=0x00000000,
-       SHTDN_REASON_MAJOR_HARDWARE=0x00010000,
-       SHTDN_REASON_MAJOR_OPERATINGSYSTEM=0x00020000,
-       SHTDN_REASON_MAJOR_SOFTWARE=0x00030000,
-       SHTDN_REASON_MAJOR_APPLICATION=0x00040000,
-       SHTDN_REASON_MAJOR_SYSTEM=0x00050000,
-       SHTDN_REASON_MAJOR_POWER=0x00060000,
-       SHTDN_REASON_MAJOR_LEGACY_API=0x00070000
+       SHTDN_REASON_MAJOR_OTHER=(int)(0x00000000),
+       SHTDN_REASON_MAJOR_HARDWARE=(int)(0x00010000),
+       SHTDN_REASON_MAJOR_OPERATINGSYSTEM=(int)(0x00020000),
+       SHTDN_REASON_MAJOR_SOFTWARE=(int)(0x00030000),
+       SHTDN_REASON_MAJOR_APPLICATION=(int)(0x00040000),
+       SHTDN_REASON_MAJOR_SYSTEM=(int)(0x00050000),
+       SHTDN_REASON_MAJOR_POWER=(int)(0x00060000),
+       SHTDN_REASON_MAJOR_LEGACY_API=(int)(0x00070000)
 }
 #else
  { __donnot_use_enum_initshutdown_ReasonMajor=0x7FFFFFFF}
@@ -36,33 +36,33 @@ enum initshutdown_ReasonMajor
 enum initshutdown_ReasonMinor
 #ifndef USE_UINT_ENUMS
  {
-       SHTDN_REASON_MINOR_OTHER=0x00000000,
-       SHTDN_REASON_MINOR_MAINTENANCE=0x00000001,
-       SHTDN_REASON_MINOR_INSTALLATION=0x00000002,
-       SHTDN_REASON_MINOR_UPGRADE=0x00000003,
-       SHTDN_REASON_MINOR_RECONFIG=0x00000004,
-       SHTDN_REASON_MINOR_HUNG=0x00000005,
-       SHTDN_REASON_MINOR_UNSTABLE=0x00000006,
-       SHTDN_REASON_MINOR_DISK=0x00000007,
-       SHTDN_REASON_MINOR_PROCESSOR=0x00000008,
-       SHTDN_REASON_MINOR_NETWORKCARD=0x00000009,
-       SHTDN_REASON_MINOR_POWER_SUPPLY=0x0000000a,
-       SHTDN_REASON_MINOR_CORDUNPLUGGED=0x0000000b,
-       SHTDN_REASON_MINOR_ENVIRONMENT=0x0000000c,
-       SHTDN_REASON_MINOR_HARDWARE_DRIVER=0x0000000d,
-       SHTDN_REASON_MINOR_OTHERDRIVER=0x0000000e,
-       SHTDN_REASON_MINOR_BLUESCREEN=0x0000000f,
-       SHTDN_REASON_MINOR_SERVICEPACK=0x00000010,
-       SHTDN_REASON_MINOR_HOTFIX=0x00000011,
-       SHTDN_REASON_MINOR_SECURITYFIX=0x00000012,
-       SHTDN_REASON_MINOR_SECURITY=0x00000013,
-       SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY=0x00000014,
-       SHTDN_REASON_MINOR_WMI=0x00000015,
-       SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL=0x00000016,
-       SHTDN_REASON_MINOR_HOTFIX_UNINSTALL=0x00000017,
-       SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL=0x00000018,
-       SHTDN_REASON_MINOR_MMC=0x00000019,
-       SHTDN_REASON_MINOR_TERMSRV=0x00000020
+       SHTDN_REASON_MINOR_OTHER=(int)(0x00000000),
+       SHTDN_REASON_MINOR_MAINTENANCE=(int)(0x00000001),
+       SHTDN_REASON_MINOR_INSTALLATION=(int)(0x00000002),
+       SHTDN_REASON_MINOR_UPGRADE=(int)(0x00000003),
+       SHTDN_REASON_MINOR_RECONFIG=(int)(0x00000004),
+       SHTDN_REASON_MINOR_HUNG=(int)(0x00000005),
+       SHTDN_REASON_MINOR_UNSTABLE=(int)(0x00000006),
+       SHTDN_REASON_MINOR_DISK=(int)(0x00000007),
+       SHTDN_REASON_MINOR_PROCESSOR=(int)(0x00000008),
+       SHTDN_REASON_MINOR_NETWORKCARD=(int)(0x00000009),
+       SHTDN_REASON_MINOR_POWER_SUPPLY=(int)(0x0000000a),
+       SHTDN_REASON_MINOR_CORDUNPLUGGED=(int)(0x0000000b),
+       SHTDN_REASON_MINOR_ENVIRONMENT=(int)(0x0000000c),
+       SHTDN_REASON_MINOR_HARDWARE_DRIVER=(int)(0x0000000d),
+       SHTDN_REASON_MINOR_OTHERDRIVER=(int)(0x0000000e),
+       SHTDN_REASON_MINOR_BLUESCREEN=(int)(0x0000000f),
+       SHTDN_REASON_MINOR_SERVICEPACK=(int)(0x00000010),
+       SHTDN_REASON_MINOR_HOTFIX=(int)(0x00000011),
+       SHTDN_REASON_MINOR_SECURITYFIX=(int)(0x00000012),
+       SHTDN_REASON_MINOR_SECURITY=(int)(0x00000013),
+       SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY=(int)(0x00000014),
+       SHTDN_REASON_MINOR_WMI=(int)(0x00000015),
+       SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL=(int)(0x00000016),
+       SHTDN_REASON_MINOR_HOTFIX_UNINSTALL=(int)(0x00000017),
+       SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL=(int)(0x00000018),
+       SHTDN_REASON_MINOR_MMC=(int)(0x00000019),
+       SHTDN_REASON_MINOR_TERMSRV=(int)(0x00000020)
 }
 #else
  { __donnot_use_enum_initshutdown_ReasonMinor=0x7FFFFFFF}
index 03b23bdaaeb99be287949dc8206bb21f5912990a..fc277325f6fe0f9ccff9090c2ce4a405c9d7c8db 100644 (file)
@@ -48,12 +48,12 @@ struct PAC_LOGON_INFO_CTR {
 enum PAC_TYPE
 #ifndef USE_UINT_ENUMS
  {
-       PAC_TYPE_LOGON_INFO=1,
-       PAC_TYPE_SRV_CHECKSUM=6,
-       PAC_TYPE_KDC_CHECKSUM=7,
-       PAC_TYPE_LOGON_NAME=10,
-       PAC_TYPE_CONSTRAINED_DELEGATION=11,
-       PAC_TYPE_UNKNOWN_12=12
+       PAC_TYPE_LOGON_INFO=(int)(1),
+       PAC_TYPE_SRV_CHECKSUM=(int)(6),
+       PAC_TYPE_KDC_CHECKSUM=(int)(7),
+       PAC_TYPE_LOGON_NAME=(int)(10),
+       PAC_TYPE_CONSTRAINED_DELEGATION=(int)(11),
+       PAC_TYPE_UNKNOWN_12=(int)(12)
 }
 #else
  { __donnot_use_enum_PAC_TYPE=0x7FFFFFFF}
index a47259145b9094c0c2e75dde7581623003165f82..f101fb6f2c778d15169e270b9a6de14299cd0769 100644 (file)
@@ -135,11 +135,11 @@ struct lsa_AuditLogInfo {
 enum lsa_PolicyAuditPolicy
 #ifndef USE_UINT_ENUMS
  {
-       LSA_AUDIT_POLICY_NONE=0,
-       LSA_AUDIT_POLICY_SUCCESS=1,
-       LSA_AUDIT_POLICY_FAILURE=2,
-       LSA_AUDIT_POLICY_ALL=(LSA_AUDIT_POLICY_SUCCESS|LSA_AUDIT_POLICY_FAILURE),
-       LSA_AUDIT_POLICY_CLEAR=4
+       LSA_AUDIT_POLICY_NONE=(int)(0),
+       LSA_AUDIT_POLICY_SUCCESS=(int)(1),
+       LSA_AUDIT_POLICY_FAILURE=(int)(2),
+       LSA_AUDIT_POLICY_ALL=(int)((LSA_AUDIT_POLICY_SUCCESS|LSA_AUDIT_POLICY_FAILURE)),
+       LSA_AUDIT_POLICY_CLEAR=(int)(4)
 }
 #else
  { __donnot_use_enum_lsa_PolicyAuditPolicy=0x7FFFFFFF}
@@ -154,15 +154,15 @@ enum lsa_PolicyAuditPolicy
 enum lsa_PolicyAuditEventType
 #ifndef USE_UINT_ENUMS
  {
-       LSA_AUDIT_CATEGORY_SYSTEM=0,
-       LSA_AUDIT_CATEGORY_LOGON=1,
-       LSA_AUDIT_CATEGORY_FILE_AND_OBJECT_ACCESS=2,
-       LSA_AUDIT_CATEGORY_USE_OF_USER_RIGHTS=3,
-       LSA_AUDIT_CATEGORY_PROCCESS_TRACKING=4,
-       LSA_AUDIT_CATEGORY_SECURITY_POLICY_CHANGES=5,
-       LSA_AUDIT_CATEGORY_ACCOUNT_MANAGEMENT=6,
-       LSA_AUDIT_CATEGORY_DIRECTORY_SERVICE_ACCESS=7,
-       LSA_AUDIT_CATEGORY_ACCOUNT_LOGON=8
+       LSA_AUDIT_CATEGORY_SYSTEM=(int)(0),
+       LSA_AUDIT_CATEGORY_LOGON=(int)(1),
+       LSA_AUDIT_CATEGORY_FILE_AND_OBJECT_ACCESS=(int)(2),
+       LSA_AUDIT_CATEGORY_USE_OF_USER_RIGHTS=(int)(3),
+       LSA_AUDIT_CATEGORY_PROCCESS_TRACKING=(int)(4),
+       LSA_AUDIT_CATEGORY_SECURITY_POLICY_CHANGES=(int)(5),
+       LSA_AUDIT_CATEGORY_ACCOUNT_MANAGEMENT=(int)(6),
+       LSA_AUDIT_CATEGORY_DIRECTORY_SERVICE_ACCESS=(int)(7),
+       LSA_AUDIT_CATEGORY_ACCOUNT_LOGON=(int)(8)
 }
 #else
  { __donnot_use_enum_lsa_PolicyAuditEventType=0x7FFFFFFF}
@@ -196,8 +196,8 @@ struct lsa_PDAccountInfo {
 enum lsa_Role
 #ifndef USE_UINT_ENUMS
  {
-       LSA_ROLE_BACKUP=2,
-       LSA_ROLE_PRIMARY=3
+       LSA_ROLE_BACKUP=(int)(2),
+       LSA_ROLE_PRIMARY=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_Role=0x7FFFFFFF}
@@ -249,20 +249,20 @@ struct lsa_DnsDomainInfo {
 enum lsa_PolicyInfo
 #ifndef USE_UINT_ENUMS
  {
-       LSA_POLICY_INFO_AUDIT_LOG=1,
-       LSA_POLICY_INFO_AUDIT_EVENTS=2,
-       LSA_POLICY_INFO_DOMAIN=3,
-       LSA_POLICY_INFO_PD=4,
-       LSA_POLICY_INFO_ACCOUNT_DOMAIN=5,
-       LSA_POLICY_INFO_ROLE=6,
-       LSA_POLICY_INFO_REPLICA=7,
-       LSA_POLICY_INFO_QUOTA=8,
-       LSA_POLICY_INFO_MOD=9,
-       LSA_POLICY_INFO_AUDIT_FULL_SET=10,
-       LSA_POLICY_INFO_AUDIT_FULL_QUERY=11,
-       LSA_POLICY_INFO_DNS=12,
-       LSA_POLICY_INFO_DNS_INT=13,
-       LSA_POLICY_INFO_L_ACCOUNT_DOMAIN=14
+       LSA_POLICY_INFO_AUDIT_LOG=(int)(1),
+       LSA_POLICY_INFO_AUDIT_EVENTS=(int)(2),
+       LSA_POLICY_INFO_DOMAIN=(int)(3),
+       LSA_POLICY_INFO_PD=(int)(4),
+       LSA_POLICY_INFO_ACCOUNT_DOMAIN=(int)(5),
+       LSA_POLICY_INFO_ROLE=(int)(6),
+       LSA_POLICY_INFO_REPLICA=(int)(7),
+       LSA_POLICY_INFO_QUOTA=(int)(8),
+       LSA_POLICY_INFO_MOD=(int)(9),
+       LSA_POLICY_INFO_AUDIT_FULL_SET=(int)(10),
+       LSA_POLICY_INFO_AUDIT_FULL_QUERY=(int)(11),
+       LSA_POLICY_INFO_DNS=(int)(12),
+       LSA_POLICY_INFO_DNS_INT=(int)(13),
+       LSA_POLICY_INFO_L_ACCOUNT_DOMAIN=(int)(14)
 }
 #else
  { __donnot_use_enum_lsa_PolicyInfo=0x7FFFFFFF}
@@ -316,16 +316,16 @@ struct lsa_DomainList {
 enum lsa_SidType
 #ifndef USE_UINT_ENUMS
  {
-       SID_NAME_USE_NONE=0,
-       SID_NAME_USER=1,
-       SID_NAME_DOM_GRP=2,
-       SID_NAME_DOMAIN=3,
-       SID_NAME_ALIAS=4,
-       SID_NAME_WKN_GRP=5,
-       SID_NAME_DELETED=6,
-       SID_NAME_INVALID=7,
-       SID_NAME_UNKNOWN=8,
-       SID_NAME_COMPUTER=9
+       SID_NAME_USE_NONE=(int)(0),
+       SID_NAME_USER=(int)(1),
+       SID_NAME_DOM_GRP=(int)(2),
+       SID_NAME_DOMAIN=(int)(3),
+       SID_NAME_ALIAS=(int)(4),
+       SID_NAME_WKN_GRP=(int)(5),
+       SID_NAME_DELETED=(int)(6),
+       SID_NAME_INVALID=(int)(7),
+       SID_NAME_UNKNOWN=(int)(8),
+       SID_NAME_COMPUTER=(int)(9)
 }
 #else
  { __donnot_use_enum_lsa_SidType=0x7FFFFFFF}
@@ -362,13 +362,13 @@ struct lsa_RefDomainList {
 enum lsa_LookupNamesLevel
 #ifndef USE_UINT_ENUMS
  {
-       LSA_LOOKUP_NAMES_ALL=1,
-       LSA_LOOKUP_NAMES_DOMAINS_ONLY=2,
-       LSA_LOOKUP_NAMES_PRIMARY_DOMAIN_ONLY=3,
-       LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY=4,
-       LSA_LOOKUP_NAMES_FOREST_TRUSTS_ONLY=5,
-       LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2=6,
-       LSA_LOOKUP_NAMES_RODC_REFERRAL_TO_FULL_DC=7
+       LSA_LOOKUP_NAMES_ALL=(int)(1),
+       LSA_LOOKUP_NAMES_DOMAINS_ONLY=(int)(2),
+       LSA_LOOKUP_NAMES_PRIMARY_DOMAIN_ONLY=(int)(3),
+       LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY=(int)(4),
+       LSA_LOOKUP_NAMES_FOREST_TRUSTS_ONLY=(int)(5),
+       LSA_LOOKUP_NAMES_UPLEVEL_TRUSTS_ONLY2=(int)(6),
+       LSA_LOOKUP_NAMES_RODC_REFERRAL_TO_FULL_DC=(int)(7)
 }
 #else
  { __donnot_use_enum_lsa_LookupNamesLevel=0x7FFFFFFF}
@@ -433,19 +433,19 @@ struct lsa_DATA_BUF2 {
 enum lsa_TrustDomInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-       LSA_TRUSTED_DOMAIN_INFO_NAME=1,
-       LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS=2,
-       LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET=3,
-       LSA_TRUSTED_DOMAIN_INFO_PASSWORD=4,
-       LSA_TRUSTED_DOMAIN_INFO_BASIC=5,
-       LSA_TRUSTED_DOMAIN_INFO_INFO_EX=6,
-       LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO=7,
-       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO=8,
-       LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL=9,
-       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL=10,
-       LSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL=11,
-       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL=12,
-       LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES=13
+       LSA_TRUSTED_DOMAIN_INFO_NAME=(int)(1),
+       LSA_TRUSTED_DOMAIN_INFO_CONTROLLERS=(int)(2),
+       LSA_TRUSTED_DOMAIN_INFO_POSIX_OFFSET=(int)(3),
+       LSA_TRUSTED_DOMAIN_INFO_PASSWORD=(int)(4),
+       LSA_TRUSTED_DOMAIN_INFO_BASIC=(int)(5),
+       LSA_TRUSTED_DOMAIN_INFO_INFO_EX=(int)(6),
+       LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO=(int)(7),
+       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO=(int)(8),
+       LSA_TRUSTED_DOMAIN_INFO_AUTH_INFO_INTERNAL=(int)(9),
+       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_INTERNAL=(int)(10),
+       LSA_TRUSTED_DOMAIN_INFO_INFO_EX2_INTERNAL=(int)(11),
+       LSA_TRUSTED_DOMAIN_INFO_FULL_INFO_2_INTERNAL=(int)(12),
+       LSA_TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES=(int)(13)
 }
 #else
  { __donnot_use_enum_lsa_TrustDomInfoEnum=0x7FFFFFFF}
@@ -472,9 +472,9 @@ enum lsa_TrustDomInfoEnum
 enum lsa_TrustType
 #ifndef USE_UINT_ENUMS
  {
-       LSA_TRUST_TYPE_DOWNLEVEL=0x00000001,
-       LSA_TRUST_TYPE_UPLEVEL=0x00000002,
-       LSA_TRUST_TYPE_MIT=0x00000003
+       LSA_TRUST_TYPE_DOWNLEVEL=(int)(0x00000001),
+       LSA_TRUST_TYPE_UPLEVEL=(int)(0x00000002),
+       LSA_TRUST_TYPE_MIT=(int)(0x00000003)
 }
 #else
  { __donnot_use_enum_lsa_TrustType=0x7FFFFFFF}
@@ -529,10 +529,10 @@ struct lsa_TrustDomainInfoInfoEx {
 enum lsa_TrustAuthType
 #ifndef USE_UINT_ENUMS
  {
-       TRUST_AUTH_TYPE_NONE=0,
-       TRUST_AUTH_TYPE_NT4OWF=1,
-       TRUST_AUTH_TYPE_CLEAR=2,
-       TRUST_AUTH_TYPE_VERSION=3
+       TRUST_AUTH_TYPE_NONE=(int)(0),
+       TRUST_AUTH_TYPE_NT4OWF=(int)(1),
+       TRUST_AUTH_TYPE_CLEAR=(int)(2),
+       TRUST_AUTH_TYPE_VERSION=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_TrustAuthType=0x7FFFFFFF}
@@ -641,8 +641,8 @@ struct lsa_DomainInfoEfs {
 enum lsa_DomainInfoEnum
 #ifndef USE_UINT_ENUMS
  {
-       LSA_DOMAIN_INFO_POLICY_EFS=2,
-       LSA_DOMAIN_INFO_POLICY_KERBEROS=3
+       LSA_DOMAIN_INFO_POLICY_EFS=(int)(2),
+       LSA_DOMAIN_INFO_POLICY_KERBEROS=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_DomainInfoEnum=0x7FFFFFFF}
@@ -671,8 +671,8 @@ struct lsa_TransNameArray2 {
 enum lsa_LookupOptions
 #ifndef USE_UINT_ENUMS
  {
-       LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES=0x00000000,
-       LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES_LOCAL=0x80000000
+       LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES=(int)(0x00000000),
+       LSA_LOOKUP_OPTION_SEARCH_ISOLATED_NAMES_LOCAL=(int)(0x80000000)
 }
 #else
  { __donnot_use_enum_lsa_LookupOptions=0x7FFFFFFF}
@@ -684,8 +684,8 @@ enum lsa_LookupOptions
 enum lsa_ClientRevision
 #ifndef USE_UINT_ENUMS
  {
-       LSA_CLIENT_REVISION_1=0x00000001,
-       LSA_CLIENT_REVISION_2=0x00000002
+       LSA_CLIENT_REVISION_1=(int)(0x00000001),
+       LSA_CLIENT_REVISION_2=(int)(0x00000002)
 }
 #else
  { __donnot_use_enum_lsa_ClientRevision=0x7FFFFFFF}
@@ -739,10 +739,10 @@ union lsa_ForestTrustData {
 enum lsa_ForestTrustRecordType
 #ifndef USE_UINT_ENUMS
  {
-       LSA_FOREST_TRUST_TOP_LEVEL_NAME=0,
-       LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX=1,
-       LSA_FOREST_TRUST_DOMAIN_INFO=2,
-       LSA_FOREST_TRUST_RECORD_TYPE_LAST=3
+       LSA_FOREST_TRUST_TOP_LEVEL_NAME=(int)(0),
+       LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX=(int)(1),
+       LSA_FOREST_TRUST_DOMAIN_INFO=(int)(2),
+       LSA_FOREST_TRUST_RECORD_TYPE_LAST=(int)(3)
 }
 #else
  { __donnot_use_enum_lsa_ForestTrustRecordType=0x7FFFFFFF}
index 824483d29206a63de54cc8ae31ca9b1539fa2d29..aa24a0fe17426a3a0e6296f4c66ba9337cb16f1a 100644 (file)
@@ -28,11 +28,11 @@ struct policy_handle {
 enum netr_SchannelType
 #ifndef USE_UINT_ENUMS
  {
-       SEC_CHAN_NULL=0,
-       SEC_CHAN_WKSTA=2,
-       SEC_CHAN_DNS_DOMAIN=3,
-       SEC_CHAN_DOMAIN=4,
-       SEC_CHAN_BDC=6
+       SEC_CHAN_NULL=(int)(0),
+       SEC_CHAN_WKSTA=(int)(2),
+       SEC_CHAN_DNS_DOMAIN=(int)(3),
+       SEC_CHAN_DOMAIN=(int)(4),
+       SEC_CHAN_BDC=(int)(6)
 }
 #else
  { __donnot_use_enum_netr_SchannelType=0x7FFFFFFF}
index affbeffa08651a63de2f04ee7eaccd38d1033b77..e596abd8c1c35ce5a79ae83563e89dccf71b75bf 100644 (file)
 enum nbt_opcode
 #ifndef USE_UINT_ENUMS
  {
-       NBT_OPCODE_QUERY=(0x0<<11),
-       NBT_OPCODE_REGISTER=(0x5<<11),
-       NBT_OPCODE_RELEASE=(0x6<<11),
-       NBT_OPCODE_WACK=(0x7<<11),
-       NBT_OPCODE_REFRESH=(0x8<<11),
-       NBT_OPCODE_REFRESH2=(0x9<<11),
-       NBT_OPCODE_MULTI_HOME_REG=(0xf<<11)
+       NBT_OPCODE_QUERY=(int)((0x0<<11)),
+       NBT_OPCODE_REGISTER=(int)((0x5<<11)),
+       NBT_OPCODE_RELEASE=(int)((0x6<<11)),
+       NBT_OPCODE_WACK=(int)((0x7<<11)),
+       NBT_OPCODE_REFRESH=(int)((0x8<<11)),
+       NBT_OPCODE_REFRESH2=(int)((0x9<<11)),
+       NBT_OPCODE_MULTI_HOME_REG=(int)((0xf<<11))
 }
 #else
  { __donnot_use_enum_nbt_opcode=0x7FFFFFFF}
@@ -54,14 +54,14 @@ enum nbt_opcode
 enum nbt_rcode
 #ifndef USE_UINT_ENUMS
  {
-       NBT_RCODE_OK=0x0,
-       NBT_RCODE_FMT=0x1,
-       NBT_RCODE_SVR=0x2,
-       NBT_RCODE_NAM=0x3,
-       NBT_RCODE_IMP=0x4,
-       NBT_RCODE_RFS=0x5,
-       NBT_RCODE_ACT=0x6,
-       NBT_RCODE_CFT=0x7
+       NBT_RCODE_OK=(int)(0x0),
+       NBT_RCODE_FMT=(int)(0x1),
+       NBT_RCODE_SVR=(int)(0x2),
+       NBT_RCODE_NAM=(int)(0x3),
+       NBT_RCODE_IMP=(int)(0x4),
+       NBT_RCODE_RFS=(int)(0x5),
+       NBT_RCODE_ACT=(int)(0x6),
+       NBT_RCODE_CFT=(int)(0x7)
 }
 #else
  { __donnot_use_enum_nbt_rcode=0x7FFFFFFF}
@@ -79,14 +79,14 @@ enum nbt_rcode
 enum nbt_name_type
 #ifndef USE_UINT_ENUMS
  {
-       NBT_NAME_CLIENT=0x00,
-       NBT_NAME_MS=0x01,
-       NBT_NAME_USER=0x03,
-       NBT_NAME_SERVER=0x20,
-       NBT_NAME_PDC=0x1B,
-       NBT_NAME_LOGON=0x1C,
-       NBT_NAME_MASTER=0x1D,
-       NBT_NAME_BROWSER=0x1E
+       NBT_NAME_CLIENT=(int)(0x00),
+       NBT_NAME_MS=(int)(0x01),
+       NBT_NAME_USER=(int)(0x03),
+       NBT_NAME_SERVER=(int)(0x20),
+       NBT_NAME_PDC=(int)(0x1B),
+       NBT_NAME_LOGON=(int)(0x1C),
+       NBT_NAME_MASTER=(int)(0x1D),
+       NBT_NAME_BROWSER=(int)(0x1E)
 }
 #else
  { __donnot_use_enum_nbt_name_type=0x7FFFFFFF}
@@ -110,7 +110,7 @@ struct nbt_name {
 enum nbt_qclass
 #ifndef USE_UINT_ENUMS
  {
-       NBT_QCLASS_IP=0x01
+       NBT_QCLASS_IP=(int)(0x01)
 }
 #else
  { __donnot_use_enum_nbt_qclass=0x7FFFFFFF}
@@ -121,11 +121,11 @@ enum nbt_qclass
 enum nbt_qtype
 #ifndef USE_UINT_ENUMS
  {
-       NBT_QTYPE_ADDRESS=0x0001,
-       NBT_QTYPE_NAMESERVICE=0x0002,
-       NBT_QTYPE_NULL=0x000A,
-       NBT_QTYPE_NETBIOS=0x0020,
-       NBT_QTYPE_STATUS=0x0021
+       NBT_QTYPE_ADDRESS=(int)(0x0001),
+       NBT_QTYPE_NAMESERVICE=(int)(0x0002),
+       NBT_QTYPE_NULL=(int)(0x000A),
+       NBT_QTYPE_NETBIOS=(int)(0x0020),
+       NBT_QTYPE_STATUS=(int)(0x0021)
 }
 #else
  { __donnot_use_enum_nbt_qtype=0x7FFFFFFF}
@@ -146,10 +146,10 @@ struct nbt_name_question {
 enum nbt_node_type
 #ifndef USE_UINT_ENUMS
  {
-       NBT_NODE_B=0x0000,
-       NBT_NODE_P=0x2000,
-       NBT_NODE_M=0x4000,
-       NBT_NODE_H=0x6000
+       NBT_NODE_B=(int)(0x0000),
+       NBT_NODE_P=(int)(0x2000),
+       NBT_NODE_M=(int)(0x4000),
+       NBT_NODE_H=(int)(0x6000)
 }
 #else
  { __donnot_use_enum_nbt_node_type=0x7FFFFFFF}
@@ -250,13 +250,13 @@ struct nbt_name_packet {
 enum dgram_msg_type
 #ifndef USE_UINT_ENUMS
  {
-       DGRAM_DIRECT_UNIQUE=0x10,
-       DGRAM_DIRECT_GROUP=0x11,
-       DGRAM_BCAST=0x12,
-       DGRAM_ERROR=0x13,
-       DGRAM_QUERY=0x14,
-       DGRAM_QUERY_POSITIVE=0x15,
-       DGRAM_QUERY_NEGATIVE=0x16
+       DGRAM_DIRECT_UNIQUE=(int)(0x10),
+       DGRAM_DIRECT_GROUP=(int)(0x11),
+       DGRAM_BCAST=(int)(0x12),
+       DGRAM_ERROR=(int)(0x13),
+       DGRAM_QUERY=(int)(0x14),
+       DGRAM_QUERY_POSITIVE=(int)(0x15),
+       DGRAM_QUERY_NEGATIVE=(int)(0x16)
 }
 #else
  { __donnot_use_enum_dgram_msg_type=0x7FFFFFFF}
@@ -278,10 +278,10 @@ enum dgram_msg_type
 enum dgram_node_type
 #ifndef USE_UINT_ENUMS
  {
-       DGRAM_NODE_B=0x00,
-       DGRAM_NODE_P=0x04,
-       DGRAM_NODE_M=0x08,
-       DGRAM_NODE_NBDD=0x0C
+       DGRAM_NODE_B=(int)(0x00),
+       DGRAM_NODE_P=(int)(0x04),
+       DGRAM_NODE_M=(int)(0x08),
+       DGRAM_NODE_NBDD=(int)(0x0C)
 }
 #else
  { __donnot_use_enum_dgram_node_type=0x7FFFFFFF}
@@ -295,7 +295,7 @@ enum dgram_node_type
 enum smb_command
 #ifndef USE_UINT_ENUMS
  {
-       SMB_TRANSACTION=0x25
+       SMB_TRANSACTION=(int)(0x25)
 }
 #else
  { __donnot_use_enum_smb_command=0x7FFFFFFF}
@@ -365,9 +365,9 @@ struct dgram_message {
 enum dgram_err_code
 #ifndef USE_UINT_ENUMS
  {
-       DGRAM_ERROR_NAME_NOT_PRESENT=0x82,
-       DGRAM_ERROR_INVALID_SOURCE=0x83,
-       DGRAM_ERROR_INVALID_DEST=0x84
+       DGRAM_ERROR_NAME_NOT_PRESENT=(int)(0x82),
+       DGRAM_ERROR_INVALID_SOURCE=(int)(0x83),
+       DGRAM_ERROR_INVALID_DEST=(int)(0x84)
 }
 #else
  { __donnot_use_enum_dgram_err_code=0x7FFFFFFF}
@@ -427,16 +427,16 @@ struct nbt_sockaddr {
 enum netlogon_command
 #ifndef USE_UINT_ENUMS
  {
-       LOGON_PRIMARY_QUERY=7,
-       NETLOGON_ANNOUNCE_UAS=10,
-       NETLOGON_RESPONSE_FROM_PDC=12,
-       LOGON_SAM_LOGON_REQUEST=18,
-       LOGON_SAM_LOGON_RESPONSE=19,
-       LOGON_SAM_LOGON_PAUSE_RESPONSE=20,
-       LOGON_SAM_LOGON_USER_UNKNOWN=21,
-       LOGON_SAM_LOGON_RESPONSE_EX=23,
-       LOGON_SAM_LOGON_PAUSE_RESPONSE_EX=24,
-       LOGON_SAM_LOGON_USER_UNKNOWN_EX=25
+       LOGON_PRIMARY_QUERY=(int)(7),
+       NETLOGON_ANNOUNCE_UAS=(int)(10),
+       NETLOGON_RESPONSE_FROM_PDC=(int)(12),
+       LOGON_SAM_LOGON_REQUEST=(int)(18),
+       LOGON_SAM_LOGON_RESPONSE=(int)(19),
+       LOGON_SAM_LOGON_PAUSE_RESPONSE=(int)(20),
+       LOGON_SAM_LOGON_USER_UNKNOWN=(int)(21),
+       LOGON_SAM_LOGON_RESPONSE_EX=(int)(23),
+       LOGON_SAM_LOGON_PAUSE_RESPONSE_EX=(int)(24),
+       LOGON_SAM_LOGON_USER_UNKNOWN_EX=(int)(25)
 }
 #else
  { __donnot_use_enum_netlogon_command=0x7FFFFFFF}
@@ -574,16 +574,16 @@ struct nbt_netlogon_packet {
 enum nbt_browse_opcode
 #ifndef USE_UINT_ENUMS
  {
-       HostAnnouncement=1,
-       AnnouncementRequest=2,
-       Election=8,
-       GetBackupListReq=9,
-       GetBackupListResp=10,
-       BecomeBackup=11,
-       DomainAnnouncement=12,
-       MasterAnnouncement=13,
-       ResetBrowserState=14,
-       LocalMasterAnnouncement=15
+       HostAnnouncement=(int)(1),
+       AnnouncementRequest=(int)(2),
+       Election=(int)(8),
+       GetBackupListReq=(int)(9),
+       GetBackupListResp=(int)(10),
+       BecomeBackup=(int)(11),
+       DomainAnnouncement=(int)(12),
+       MasterAnnouncement=(int)(13),
+       ResetBrowserState=(int)(14),
+       LocalMasterAnnouncement=(int)(15)
 }
 #else
  { __donnot_use_enum_nbt_browse_opcode=0x7FFFFFFF}
index 9596440f1b42aa21c73a5524bffaf0ba96104e47..c86984109fb78c5bf6204de7b6826887d090f907 100644 (file)
@@ -734,14 +734,14 @@ _PUBLIC_ void ndr_print_dcerpc_fault(struct ndr_print *ndr, const char *name, co
 
 static enum ndr_err_code ndr_push_dcerpc_AuthType(struct ndr_push *ndr, int ndr_flags, enum dcerpc_AuthType r)
 {
-       NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint8(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dcerpc_AuthType(struct ndr_pull *ndr, int ndr_flags, enum dcerpc_AuthType *r)
 {
        uint8_t v;
-       NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -767,14 +767,14 @@ _PUBLIC_ void ndr_print_dcerpc_AuthType(struct ndr_print *ndr, const char *name,
 
 static enum ndr_err_code ndr_push_dcerpc_AuthLevel(struct ndr_push *ndr, int ndr_flags, enum dcerpc_AuthLevel r)
 {
-       NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint8(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dcerpc_AuthLevel(struct ndr_pull *ndr, int ndr_flags, enum dcerpc_AuthLevel *r)
 {
        uint8_t v;
-       NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -1229,14 +1229,14 @@ _PUBLIC_ void ndr_print_dcerpc_working(struct ndr_print *ndr, const char *name,
 
 static enum ndr_err_code ndr_push_dcerpc_pkt_type(struct ndr_push *ndr, int ndr_flags, enum dcerpc_pkt_type r)
 {
-       NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint8(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dcerpc_pkt_type(struct ndr_pull *ndr, int ndr_flags, enum dcerpc_pkt_type *r)
 {
        uint8_t v;
-       NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint8(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
index bf1d30088512eaa52f3cd86f7da21933b75bf47a..20d3f22004d2b4823da6b94724edaa45f7e152e5 100644 (file)
@@ -6,14 +6,14 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 static enum ndr_err_code ndr_push_dfs_ManagerVersion(struct ndr_push *ndr, int ndr_flags, enum dfs_ManagerVersion r)
 {
-       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dfs_ManagerVersion(struct ndr_pull *ndr, int ndr_flags, enum dfs_ManagerVersion *r)
 {
        uint32_t v;
-       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -61,14 +61,14 @@ _PUBLIC_ void ndr_print_dfs_Info0(struct ndr_print *ndr, const char *name, const
 static enum ndr_err_code ndr_push_dfs_Info1(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->path));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -80,7 +80,7 @@ static enum ndr_err_code ndr_pull_dfs_Info1(struct ndr_pull *ndr, int ndr_flags,
        uint32_t _ptr_path;
        TALLOC_CTX *_mem_save_path_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_path));
                if (_ptr_path) {
                        NDR_PULL_ALLOC(ndr, r->path);
@@ -148,7 +148,7 @@ _PUBLIC_ void ndr_print_dfs_VolumeState(struct ndr_print *ndr, const char *name,
 static enum ndr_err_code ndr_push_dfs_Info2(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->path));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
@@ -156,15 +156,15 @@ static enum ndr_err_code ndr_push_dfs_Info2(struct ndr_push *ndr, int ndr_flags,
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -178,7 +178,7 @@ static enum ndr_err_code ndr_pull_dfs_Info2(struct ndr_pull *ndr, int ndr_flags,
        uint32_t _ptr_comment;
        TALLOC_CTX *_mem_save_comment_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_path));
                if (_ptr_path) {
                        NDR_PULL_ALLOC(ndr, r->path);
@@ -271,22 +271,22 @@ _PUBLIC_ void ndr_print_dfs_StorageState(struct ndr_print *ndr, const char *name
 static enum ndr_err_code ndr_push_dfs_StorageInfo(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_dfs_StorageState(ndr, NDR_SCALARS, r->state));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->server));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->share));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->server) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->server, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->server, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->server, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->server, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->server, ndr_charset_length(r->server, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->share) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->share, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->share, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->share, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->share, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->share, ndr_charset_length(r->share, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -300,7 +300,7 @@ static enum ndr_err_code ndr_pull_dfs_StorageInfo(struct ndr_pull *ndr, int ndr_
        uint32_t _ptr_share;
        TALLOC_CTX *_mem_save_share_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_dfs_StorageState(ndr, NDR_SCALARS, &r->state));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_server));
                if (_ptr_server) {
@@ -368,7 +368,7 @@ static enum ndr_err_code ndr_push_dfs_Info3(struct ndr_push *ndr, int ndr_flags,
 {
        uint32_t cntr_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->path));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
@@ -377,19 +377,19 @@ static enum ndr_err_code ndr_push_dfs_Info3(struct ndr_push *ndr, int ndr_flags,
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->stores) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_stores));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_stores));
                        for (cntr_stores_1 = 0; cntr_stores_1 < r->num_stores; cntr_stores_1++) {
                                NDR_CHECK(ndr_push_dfs_StorageInfo(ndr, NDR_SCALARS, &r->stores[cntr_stores_1]));
                        }
@@ -412,7 +412,7 @@ static enum ndr_err_code ndr_pull_dfs_Info3(struct ndr_pull *ndr, int ndr_flags,
        TALLOC_CTX *_mem_save_stores_0;
        TALLOC_CTX *_mem_save_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_path));
                if (_ptr_path) {
                        NDR_PULL_ALLOC(ndr, r->path);
@@ -523,7 +523,7 @@ static enum ndr_err_code ndr_push_dfs_Info4(struct ndr_push *ndr, int ndr_flags,
 {
        uint32_t cntr_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->path));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
@@ -534,19 +534,19 @@ static enum ndr_err_code ndr_push_dfs_Info4(struct ndr_push *ndr, int ndr_flags,
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->stores) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_stores));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_stores));
                        for (cntr_stores_1 = 0; cntr_stores_1 < r->num_stores; cntr_stores_1++) {
                                NDR_CHECK(ndr_push_dfs_StorageInfo(ndr, NDR_SCALARS, &r->stores[cntr_stores_1]));
                        }
@@ -569,7 +569,7 @@ static enum ndr_err_code ndr_pull_dfs_Info4(struct ndr_pull *ndr, int ndr_flags,
        TALLOC_CTX *_mem_save_stores_0;
        TALLOC_CTX *_mem_save_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_path));
                if (_ptr_path) {
                        NDR_PULL_ALLOC(ndr, r->path);
@@ -709,7 +709,7 @@ _PUBLIC_ void ndr_print_dfs_PropertyFlags(struct ndr_print *ndr, const char *nam
 static enum ndr_err_code ndr_push_dfs_Info5(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info5 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->path));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
@@ -721,15 +721,15 @@ static enum ndr_err_code ndr_push_dfs_Info5(struct ndr_push *ndr, int ndr_flags,
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -743,7 +743,7 @@ static enum ndr_err_code ndr_pull_dfs_Info5(struct ndr_pull *ndr, int ndr_flags,
        uint32_t _ptr_comment;
        TALLOC_CTX *_mem_save_comment_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_path));
                if (_ptr_path) {
                        NDR_PULL_ALLOC(ndr, r->path);
@@ -819,14 +819,14 @@ _PUBLIC_ void ndr_print_dfs_Info5(struct ndr_print *ndr, const char *name, const
 
 static enum ndr_err_code ndr_push_dfs_Target_PriorityClass(struct ndr_push *ndr, int ndr_flags, enum dfs_Target_PriorityClass r)
 {
-       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dfs_Target_PriorityClass(struct ndr_pull *ndr, int ndr_flags, enum dfs_Target_PriorityClass *r)
 {
        uint32_t v;
-       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -885,7 +885,7 @@ _PUBLIC_ void ndr_print_dfs_Target_Priority(struct ndr_print *ndr, const char *n
 static enum ndr_err_code ndr_push_dfs_StorageInfo2(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_dfs_StorageInfo(ndr, NDR_SCALARS, &r->info));
                NDR_CHECK(ndr_push_dfs_Target_Priority(ndr, NDR_SCALARS, &r->target_priority));
        }
@@ -898,7 +898,7 @@ static enum ndr_err_code ndr_push_dfs_StorageInfo2(struct ndr_push *ndr, int ndr
 static enum ndr_err_code ndr_pull_dfs_StorageInfo2(struct ndr_pull *ndr, int ndr_flags, struct dfs_StorageInfo2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_dfs_StorageInfo(ndr, NDR_SCALARS, &r->info));
                NDR_CHECK(ndr_pull_dfs_Target_Priority(ndr, NDR_SCALARS, &r->target_priority));
        }
@@ -921,7 +921,7 @@ static enum ndr_err_code ndr_push_dfs_Info6(struct ndr_push *ndr, int ndr_flags,
 {
        uint32_t cntr_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->entry_path));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
@@ -934,19 +934,19 @@ static enum ndr_err_code ndr_push_dfs_Info6(struct ndr_push *ndr, int ndr_flags,
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->entry_path) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->entry_path, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->entry_path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->entry_path, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->entry_path, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->entry_path, ndr_charset_length(r->entry_path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->stores) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_stores));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_stores));
                        for (cntr_stores_1 = 0; cntr_stores_1 < r->num_stores; cntr_stores_1++) {
                                NDR_CHECK(ndr_push_dfs_StorageInfo2(ndr, NDR_SCALARS, &r->stores[cntr_stores_1]));
                        }
@@ -969,7 +969,7 @@ static enum ndr_err_code ndr_pull_dfs_Info6(struct ndr_pull *ndr, int ndr_flags,
        TALLOC_CTX *_mem_save_stores_0;
        TALLOC_CTX *_mem_save_stores_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_entry_path));
                if (_ptr_entry_path) {
                        NDR_PULL_ALLOC(ndr, r->entry_path);
@@ -1117,14 +1117,14 @@ _PUBLIC_ void ndr_print_dfs_Info7(struct ndr_print *ndr, const char *name, const
 static enum ndr_err_code ndr_push_dfs_Info100(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info100 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -1136,7 +1136,7 @@ static enum ndr_err_code ndr_pull_dfs_Info100(struct ndr_pull *ndr, int ndr_flag
        uint32_t _ptr_comment;
        TALLOC_CTX *_mem_save_comment_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_comment));
                if (_ptr_comment) {
                        NDR_PULL_ALLOC(ndr, r->comment);
@@ -1297,7 +1297,7 @@ _PUBLIC_ void ndr_print_dfs_Info104(struct ndr_print *ndr, const char *name, con
 static enum ndr_err_code ndr_push_dfs_Info105(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info105 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->comment));
                NDR_CHECK(ndr_push_dfs_VolumeState(ndr, NDR_SCALARS, r->state));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->timeout));
@@ -1306,9 +1306,9 @@ static enum ndr_err_code ndr_push_dfs_Info105(struct ndr_push *ndr, int ndr_flag
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -1320,7 +1320,7 @@ static enum ndr_err_code ndr_pull_dfs_Info105(struct ndr_pull *ndr, int ndr_flag
        uint32_t _ptr_comment;
        TALLOC_CTX *_mem_save_comment_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_comment));
                if (_ptr_comment) {
                        NDR_PULL_ALLOC(ndr, r->comment);
@@ -1402,14 +1402,14 @@ _PUBLIC_ void ndr_print_dfs_Info106(struct ndr_print *ndr, const char *name, con
 static enum ndr_err_code ndr_push_dfs_Info200(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info200 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->dom_root));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->dom_root) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->dom_root, ndr_charset_length(r->dom_root, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -1421,7 +1421,7 @@ static enum ndr_err_code ndr_pull_dfs_Info200(struct ndr_pull *ndr, int ndr_flag
        uint32_t _ptr_dom_root;
        TALLOC_CTX *_mem_save_dom_root_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dom_root));
                if (_ptr_dom_root) {
                        NDR_PULL_ALLOC(ndr, r->dom_root);
@@ -1461,14 +1461,14 @@ _PUBLIC_ void ndr_print_dfs_Info200(struct ndr_print *ndr, const char *name, con
 
 static enum ndr_err_code ndr_push_dfs_VolumeFlavor(struct ndr_push *ndr, int ndr_flags, enum dfs_VolumeFlavor r)
 {
-       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint16(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_dfs_VolumeFlavor(struct ndr_pull *ndr, int ndr_flags, enum dfs_VolumeFlavor *r)
 {
        uint16_t v;
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint16(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -1487,15 +1487,15 @@ _PUBLIC_ void ndr_print_dfs_VolumeFlavor(struct ndr_print *ndr, const char *name
 static enum ndr_err_code ndr_push_dfs_Info300(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info300 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_dfs_VolumeFlavor(ndr, NDR_SCALARS, r->flavor));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->dom_root));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->dom_root) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dom_root, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->dom_root, ndr_charset_length(r->dom_root, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -1507,7 +1507,7 @@ static enum ndr_err_code ndr_pull_dfs_Info300(struct ndr_pull *ndr, int ndr_flag
        uint32_t _ptr_dom_root;
        TALLOC_CTX *_mem_save_dom_root_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_dfs_VolumeFlavor(ndr, NDR_SCALARS, &r->flavor));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dom_root));
                if (_ptr_dom_root) {
@@ -2191,13 +2191,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray1(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info1(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2216,7 +2216,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray1(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2277,13 +2277,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray2(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info2(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2302,7 +2302,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray2(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2363,13 +2363,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray3(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info3(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2388,7 +2388,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray3(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2449,13 +2449,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray4(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info4(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2474,7 +2474,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray4(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2535,13 +2535,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray5(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info5(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2560,7 +2560,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray5(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2621,13 +2621,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray6(struct ndr_push *ndr, int ndr_f
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info6(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2646,7 +2646,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray6(struct ndr_pull *ndr, int ndr_f
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2707,13 +2707,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray200(struct ndr_push *ndr, int ndr
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info200(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2732,7 +2732,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray200(struct ndr_pull *ndr, int ndr
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -2793,13 +2793,13 @@ static enum ndr_err_code ndr_push_dfs_EnumArray300(struct ndr_push *ndr, int ndr
 {
        uint32_t cntr_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->s));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->s) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_s_1 = 0; cntr_s_1 < r->count; cntr_s_1++) {
                                NDR_CHECK(ndr_push_dfs_Info300(ndr, NDR_SCALARS, &r->s[cntr_s_1]));
                        }
@@ -2818,7 +2818,7 @@ static enum ndr_err_code ndr_pull_dfs_EnumArray300(struct ndr_pull *ndr, int ndr
        TALLOC_CTX *_mem_save_s_0;
        TALLOC_CTX *_mem_save_s_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_s));
                if (_ptr_s) {
@@ -3245,7 +3245,7 @@ _PUBLIC_ void ndr_print_dfs_EnumInfo(struct ndr_print *ndr, const char *name, co
 static enum ndr_err_code ndr_push_dfs_EnumStruct(struct ndr_push *ndr, int ndr_flags, const struct dfs_EnumStruct *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->level));
                NDR_CHECK(ndr_push_set_switch_value(ndr, &r->e, r->level));
                NDR_CHECK(ndr_push_dfs_EnumInfo(ndr, NDR_SCALARS, &r->e));
@@ -3259,7 +3259,7 @@ static enum ndr_err_code ndr_push_dfs_EnumStruct(struct ndr_push *ndr, int ndr_f
 static enum ndr_err_code ndr_pull_dfs_EnumStruct(struct ndr_pull *ndr, int ndr_flags, struct dfs_EnumStruct *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->level));
                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->e, r->level));
                NDR_CHECK(ndr_pull_dfs_EnumInfo(ndr, NDR_SCALARS, &r->e));
@@ -3283,15 +3283,15 @@ _PUBLIC_ void ndr_print_dfs_EnumStruct(struct ndr_print *ndr, const char *name,
 static enum ndr_err_code ndr_push_dfs_UnknownStruct(struct ndr_push *ndr, int ndr_flags, const struct dfs_UnknownStruct *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->unknown2));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->unknown2) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->unknown2, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->unknown2, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->unknown2, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->unknown2, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->unknown2, ndr_charset_length(r->unknown2, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -3303,7 +3303,7 @@ static enum ndr_err_code ndr_pull_dfs_UnknownStruct(struct ndr_pull *ndr, int nd
        uint32_t _ptr_unknown2;
        TALLOC_CTX *_mem_save_unknown2_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown2));
                if (_ptr_unknown2) {
@@ -3407,29 +3407,29 @@ static enum ndr_err_code ndr_push_dfs_Add(struct ndr_push *ndr, int flags, const
                if (r->in.path == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.path, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.path, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.path, ndr_charset_length(r->in.path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                if (r->in.server == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.server, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.server, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.server, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.server, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.server, ndr_charset_length(r->in.server, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.share));
                if (r->in.share) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.share, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.share, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.share, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.share, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.share, ndr_charset_length(r->in.share, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.comment));
                if (r->in.comment) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.comment, ndr_charset_length(r->in.comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
@@ -3553,22 +3553,22 @@ static enum ndr_err_code ndr_push_dfs_Remove(struct ndr_push *ndr, int flags, co
                if (r->in.dfs_entry_path == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfs_entry_path, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.servername));
                if (r->in.servername) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.sharename));
                if (r->in.sharename) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.sharename, ndr_charset_length(r->in.sharename, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -3675,22 +3675,22 @@ _PUBLIC_ void ndr_print_dfs_Remove(struct ndr_print *ndr, const char *name, int
 static enum ndr_err_code ndr_push_dfs_SetInfo(struct ndr_push *ndr, int flags, const struct dfs_SetInfo *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfs_entry_path, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.servername));
                if (r->in.servername) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.sharename));
                if (r->in.sharename) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.sharename, ndr_charset_length(r->in.sharename, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
@@ -3816,22 +3816,22 @@ _PUBLIC_ void ndr_print_dfs_SetInfo(struct ndr_print *ndr, const char *name, int
 static enum ndr_err_code ndr_push_dfs_GetInfo(struct ndr_push *ndr, int flags, const struct dfs_GetInfo *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfs_entry_path, ndr_charset_length(r->in.dfs_entry_path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.servername));
                if (r->in.servername) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.sharename));
                if (r->in.sharename) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.sharename, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.sharename, ndr_charset_length(r->in.sharename, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
@@ -4266,29 +4266,29 @@ _PUBLIC_ void ndr_print_dfs_ManagerSendSiteInfo(struct ndr_print *ndr, const cha
 static enum ndr_err_code ndr_push_dfs_AddFtRoot(struct ndr_push *ndr, int flags, const struct dfs_AddFtRoot *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dns_servername, ndr_charset_length(r->in.dns_servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfsname, ndr_charset_length(r->in.dfsname, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.comment, ndr_charset_length(r->in.comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_config_dn, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_config_dn, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_config_dn, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_config_dn, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfs_config_dn, ndr_charset_length(r->in.dfs_config_dn, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.unknown1));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
@@ -4472,21 +4472,21 @@ _PUBLIC_ void ndr_print_dfs_AddFtRoot(struct ndr_print *ndr, const char *name, i
 static enum ndr_err_code ndr_push_dfs_RemoveFtRoot(struct ndr_push *ndr, int flags, const struct dfs_RemoveFtRoot *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dns_servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dns_servername, ndr_charset_length(r->in.dns_servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfsname, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfsname, ndr_charset_length(r->in.dfsname, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.unknown));
@@ -4651,17 +4651,17 @@ _PUBLIC_ void ndr_print_dfs_RemoveFtRoot(struct ndr_print *ndr, const char *name
 static enum ndr_err_code ndr_push_dfs_AddStdRoot(struct ndr_push *ndr, int flags, const struct dfs_AddStdRoot *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.comment, ndr_charset_length(r->in.comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
        }
@@ -4731,13 +4731,13 @@ _PUBLIC_ void ndr_print_dfs_AddStdRoot(struct ndr_print *ndr, const char *name,
 static enum ndr_err_code ndr_push_dfs_RemoveStdRoot(struct ndr_push *ndr, int flags, const struct dfs_RemoveStdRoot *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
        }
@@ -4802,9 +4802,9 @@ static enum ndr_err_code ndr_push_dfs_ManagerInitialize(struct ndr_push *ndr, in
                if (r->in.servername == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
        }
@@ -4861,21 +4861,21 @@ _PUBLIC_ void ndr_print_dfs_ManagerInitialize(struct ndr_print *ndr, const char
 static enum ndr_err_code ndr_push_dfs_AddStdRootForced(struct ndr_push *ndr, int flags, const struct dfs_AddStdRootForced *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.comment, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.comment, ndr_charset_length(r->in.comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.store, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.store, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.store, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.store, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.store, ndr_charset_length(r->in.store, CH_UTF16), sizeof(uint16_t), CH_UTF16));
        }
        if (flags & NDR_OUT) {
@@ -4950,18 +4950,18 @@ _PUBLIC_ void ndr_print_dfs_AddStdRootForced(struct ndr_print *ndr, const char *
 static enum ndr_err_code ndr_push_dfs_GetDcAddress(struct ndr_push *ndr, int flags, const struct dfs_GetDcAddress *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                if (r->in.server_fullname == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, *r->in.server_fullname));
                if (*r->in.server_fullname) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->in.server_fullname, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->in.server_fullname, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->in.server_fullname, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->in.server_fullname, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, *r->in.server_fullname, ndr_charset_length(*r->in.server_fullname, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->in.is_root == NULL) {
@@ -4979,9 +4979,9 @@ static enum ndr_err_code ndr_push_dfs_GetDcAddress(struct ndr_push *ndr, int fla
                }
                NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.server_fullname));
                if (*r->out.server_fullname) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->out.server_fullname, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->out.server_fullname, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->out.server_fullname, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(*r->out.server_fullname, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, *r->out.server_fullname, ndr_charset_length(*r->out.server_fullname, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
                if (r->out.is_root == NULL) {
@@ -5162,13 +5162,13 @@ _PUBLIC_ void ndr_print_dfs_GetDcAddress(struct ndr_print *ndr, const char *name
 static enum ndr_err_code ndr_push_dfs_SetDcAddress(struct ndr_push *ndr, int flags, const struct dfs_SetDcAddress *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.server_fullname, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.server_fullname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.server_fullname, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.server_fullname, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.server_fullname, ndr_charset_length(r->in.server_fullname, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.ttl));
@@ -5233,13 +5233,13 @@ _PUBLIC_ void ndr_print_dfs_SetDcAddress(struct ndr_print *ndr, const char *name
 static enum ndr_err_code ndr_push_dfs_FlushFtTable(struct ndr_push *ndr, int flags, const struct dfs_FlushFtTable *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.servername, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.servername, ndr_charset_length(r->in.servername, CH_UTF16), sizeof(uint16_t), CH_UTF16));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.rootshare, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.rootshare, ndr_charset_length(r->in.rootshare, CH_UTF16), sizeof(uint16_t), CH_UTF16));
        }
        if (flags & NDR_OUT) {
@@ -5380,9 +5380,9 @@ _PUBLIC_ void ndr_print_dfs_Remove2(struct ndr_print *ndr, const char *name, int
 _PUBLIC_ enum ndr_err_code ndr_push_dfs_EnumEx(struct ndr_push *ndr, int flags, const struct dfs_EnumEx *r)
 {
        if (flags & NDR_IN) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_name, CH_UTF16)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_name, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_name, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->in.dfs_name, CH_UTF16)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.dfs_name, ndr_charset_length(r->in.dfs_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.bufsize));
index 020d5b33762d581e7e85873a01e19d1febb418b1..2051ba64d267a5e4f7f28b652320607b32a39afd 100644 (file)
@@ -880,14 +880,14 @@ _PUBLIC_ void ndr_print_partialAttributeSetBlob(struct ndr_print *ndr, const cha
 
 static enum ndr_err_code ndr_push_prefixMapVersion(struct ndr_push *ndr, int ndr_flags, enum prefixMapVersion r)
 {
-       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_prefixMapVersion(struct ndr_pull *ndr, int ndr_flags, enum prefixMapVersion *r)
 {
        uint32_t v;
-       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -974,7 +974,7 @@ _PUBLIC_ void ndr_print_prefixMapCtr(struct ndr_print *ndr, const char *name, co
 _PUBLIC_ enum ndr_err_code ndr_push_prefixMapBlob(struct ndr_push *ndr, int ndr_flags, const struct prefixMapBlob *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_prefixMapVersion(ndr, NDR_SCALARS, r->version));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->reserved));
                NDR_CHECK(ndr_push_set_switch_value(ndr, &r->ctr, r->version));
@@ -989,7 +989,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_prefixMapBlob(struct ndr_push *ndr, int ndr_
 _PUBLIC_ enum ndr_err_code ndr_pull_prefixMapBlob(struct ndr_pull *ndr, int ndr_flags, struct prefixMapBlob *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_prefixMapVersion(ndr, NDR_SCALARS, &r->version));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->ctr, r->version));
@@ -1243,7 +1243,7 @@ static enum ndr_err_code ndr_push_supplementalCredentialsSignature(struct ndr_pu
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+               NDR_CHECK(ndr_push_enum_uint16(ndr, NDR_SCALARS, r));
                ndr->flags = _flags_save_ENUM;
        }
        return NDR_ERR_SUCCESS;
@@ -1255,7 +1255,7 @@ static enum ndr_err_code ndr_pull_supplementalCredentialsSignature(struct ndr_pu
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+               NDR_CHECK(ndr_pull_enum_uint16(ndr, NDR_SCALARS, &v));
                *r = v;
                ndr->flags = _flags_save_ENUM;
        }
@@ -1437,7 +1437,7 @@ _PUBLIC_ void ndr_print_package_PackagesBlob(struct ndr_print *ndr, const char *
 static enum ndr_err_code ndr_push_package_PrimaryKerberosString(struct ndr_push *ndr, int ndr_flags, const struct package_PrimaryKerberosString *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 2 * strlen_m(r->string)));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 2 * strlen_m(r->string)));
                {
@@ -1471,7 +1471,7 @@ static enum ndr_err_code ndr_pull_package_PrimaryKerberosString(struct ndr_pull
        uint32_t _ptr_string;
        TALLOC_CTX *_mem_save_string_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->length));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
                {
@@ -1530,7 +1530,7 @@ _PUBLIC_ void ndr_print_package_PrimaryKerberosString(struct ndr_print *ndr, con
 static enum ndr_err_code ndr_push_package_PrimaryKerberosKey3(struct ndr_push *ndr, int ndr_flags, const struct package_PrimaryKerberosKey3 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -1567,7 +1567,7 @@ static enum ndr_err_code ndr_pull_package_PrimaryKerberosKey3(struct ndr_pull *n
        uint32_t _ptr_value;
        TALLOC_CTX *_mem_save_value_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->reserved1));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->reserved2));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved3));
@@ -1634,7 +1634,7 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosCtr3(struct ndr_push *n
        uint32_t cntr_keys_0;
        uint32_t cntr_old_keys_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_keys));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_old_keys));
                NDR_CHECK(ndr_push_package_PrimaryKerberosString(ndr, NDR_SCALARS, &r->salt));
@@ -1669,7 +1669,7 @@ static enum ndr_err_code ndr_pull_package_PrimaryKerberosCtr3(struct ndr_pull *n
        uint32_t cntr_old_keys_0;
        TALLOC_CTX *_mem_save_old_keys_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_keys));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_old_keys));
                NDR_CHECK(ndr_pull_package_PrimaryKerberosString(ndr, NDR_SCALARS, &r->salt));
@@ -1751,7 +1751,7 @@ _PUBLIC_ void ndr_print_package_PrimaryKerberosCtr3(struct ndr_print *ndr, const
 static enum ndr_err_code ndr_push_package_PrimaryKerberosKey4(struct ndr_push *ndr, int ndr_flags, const struct package_PrimaryKerberosKey4 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -1789,7 +1789,7 @@ static enum ndr_err_code ndr_pull_package_PrimaryKerberosKey4(struct ndr_pull *n
        uint32_t _ptr_value;
        TALLOC_CTX *_mem_save_value_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->reserved1));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->reserved2));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved3));
@@ -1859,7 +1859,7 @@ static enum ndr_err_code ndr_push_package_PrimaryKerberosCtr4(struct ndr_push *n
        uint32_t cntr_old_keys_0;
        uint32_t cntr_older_keys_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_keys));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->num_old_keys));
@@ -1902,7 +1902,7 @@ static enum ndr_err_code ndr_pull_package_PrimaryKerberosCtr4(struct ndr_pull *n
        uint32_t cntr_older_keys_0;
        TALLOC_CTX *_mem_save_older_keys_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_keys));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_service_keys));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->num_old_keys));
@@ -2117,7 +2117,7 @@ _PUBLIC_ void ndr_print_package_PrimaryKerberosCtr(struct ndr_print *ndr, const
 _PUBLIC_ enum ndr_err_code ndr_push_package_PrimaryKerberosBlob(struct ndr_push *ndr, int ndr_flags, const struct package_PrimaryKerberosBlob *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->version));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0));
                NDR_CHECK(ndr_push_set_switch_value(ndr, &r->ctr, r->version));
@@ -2132,7 +2132,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_package_PrimaryKerberosBlob(struct ndr_push
 _PUBLIC_ enum ndr_err_code ndr_pull_package_PrimaryKerberosBlob(struct ndr_pull *ndr, int ndr_flags, struct package_PrimaryKerberosBlob *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->version));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->flags));
                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->ctr, r->version));
@@ -2618,7 +2618,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_trustCurrentPasswords(struct ndr_push *ndr,
 {
        uint32_t cntr_current_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                for (cntr_current_0 = 0; cntr_current_0 < r->count; cntr_current_0++) {
                        NDR_CHECK(ndr_push_relative_ptr1(ndr, r->current[cntr_current_0]));
@@ -2642,7 +2642,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_trustCurrentPasswords(struct ndr_pull *ndr,
        TALLOC_CTX *_mem_save_current_0;
        TALLOC_CTX *_mem_save_current_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                NDR_PULL_ALLOC_N(ndr, r->current, r->count);
                _mem_save_current_0 = NDR_PULL_GET_MEM_CTX(ndr);
@@ -2710,7 +2710,7 @@ _PUBLIC_ size_t ndr_size_trustCurrentPasswords(const struct trustCurrentPassword
 _PUBLIC_ enum ndr_err_code ndr_push_trustDomainPasswords(struct ndr_push *ndr, int ndr_flags, const struct trustDomainPasswords *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->confounder, 512));
                {
                        struct ndr_push *_ndr_outgoing;
@@ -2780,13 +2780,13 @@ _PUBLIC_ void ndr_print_DsCompressedChunk(struct ndr_print *ndr, const char *nam
 static enum ndr_err_code ndr_push_ExtendedErrorAString(struct ndr_push *ndr, int ndr_flags, const struct ExtendedErrorAString *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->__size));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->string));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->string) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->__size));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->__size));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->string, r->__size, sizeof(uint8_t), CH_DOS));
                }
        }
@@ -2798,7 +2798,7 @@ static enum ndr_err_code ndr_pull_ExtendedErrorAString(struct ndr_pull *ndr, int
        uint32_t _ptr_string;
        TALLOC_CTX *_mem_save_string_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->__size));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_string));
                if (_ptr_string) {
@@ -2839,13 +2839,13 @@ _PUBLIC_ void ndr_print_ExtendedErrorAString(struct ndr_print *ndr, const char *
 static enum ndr_err_code ndr_push_ExtendedErrorUString(struct ndr_push *ndr, int ndr_flags, const struct ExtendedErrorUString *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->__size));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->string));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->string) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->__size));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->__size));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->string, r->__size, sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -2857,7 +2857,7 @@ static enum ndr_err_code ndr_pull_ExtendedErrorUString(struct ndr_pull *ndr, int
        uint32_t _ptr_string;
        TALLOC_CTX *_mem_save_string_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->__size));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_string));
                if (_ptr_string) {
@@ -2898,13 +2898,13 @@ _PUBLIC_ void ndr_print_ExtendedErrorUString(struct ndr_print *ndr, const char *
 static enum ndr_err_code ndr_push_ExtendedErrorBlob(struct ndr_push *ndr, int ndr_flags, const struct ExtendedErrorBlob *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->length));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->data));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->data) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->length));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->length));
                        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->data, r->length));
                }
        }
@@ -2916,7 +2916,7 @@ static enum ndr_err_code ndr_pull_ExtendedErrorBlob(struct ndr_pull *ndr, int nd
        uint32_t _ptr_data;
        TALLOC_CTX *_mem_save_data_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->length));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
                if (_ptr_data) {
@@ -2957,14 +2957,14 @@ _PUBLIC_ void ndr_print_ExtendedErrorBlob(struct ndr_print *ndr, const char *nam
 
 static enum ndr_err_code ndr_push_ExtendedErrorComputerNamePresent(struct ndr_push *ndr, int ndr_flags, enum ExtendedErrorComputerNamePresent r)
 {
-       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint16(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_ExtendedErrorComputerNamePresent(struct ndr_pull *ndr, int ndr_flags, enum ExtendedErrorComputerNamePresent *r)
 {
        uint16_t v;
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint16(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -3073,7 +3073,7 @@ _PUBLIC_ void ndr_print_ExtendedErrorComputerNameU(struct ndr_print *ndr, const
 static enum ndr_err_code ndr_push_ExtendedErrorComputerName(struct ndr_push *ndr, int ndr_flags, const struct ExtendedErrorComputerName *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_ExtendedErrorComputerNamePresent(ndr, NDR_SCALARS, r->present));
                NDR_CHECK(ndr_push_set_switch_value(ndr, &r->n, r->present));
                NDR_CHECK(ndr_push_ExtendedErrorComputerNameU(ndr, NDR_SCALARS, &r->n));
@@ -3087,7 +3087,7 @@ static enum ndr_err_code ndr_push_ExtendedErrorComputerName(struct ndr_push *ndr
 static enum ndr_err_code ndr_pull_ExtendedErrorComputerName(struct ndr_pull *ndr, int ndr_flags, struct ExtendedErrorComputerName *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ExtendedErrorComputerNamePresent(ndr, NDR_SCALARS, &r->present));
                NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->n, r->present));
                NDR_CHECK(ndr_pull_ExtendedErrorComputerNameU(ndr, NDR_SCALARS, &r->n));
@@ -3110,14 +3110,14 @@ _PUBLIC_ void ndr_print_ExtendedErrorComputerName(struct ndr_print *ndr, const c
 
 static enum ndr_err_code ndr_push_ExtendedErrorParamType(struct ndr_push *ndr, int ndr_flags, enum ExtendedErrorParamType r)
 {
-       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint16(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_ExtendedErrorParamType(struct ndr_pull *ndr, int ndr_flags, enum ExtendedErrorParamType *r)
 {
        uint16_t v;
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint16(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -3364,7 +3364,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_ExtendedErrorInfo(struct ndr_push *ndr, int
 {
        uint32_t cntr_params_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_params));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_params));
                NDR_CHECK(ndr_push_align(ndr, 8));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->next));
                NDR_CHECK(ndr_push_ExtendedErrorComputerName(ndr, NDR_SCALARS, &r->computer_name));
@@ -3478,7 +3478,7 @@ _PUBLIC_ void ndr_print_ExtendedErrorInfo(struct ndr_print *ndr, const char *nam
 static enum ndr_err_code ndr_push_ExtendedErrorInfoPtr(struct ndr_push *ndr, int ndr_flags, const struct ExtendedErrorInfoPtr *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->info));
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -3494,7 +3494,7 @@ static enum ndr_err_code ndr_pull_ExtendedErrorInfoPtr(struct ndr_pull *ndr, int
        uint32_t _ptr_info;
        TALLOC_CTX *_mem_save_info_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
                if (_ptr_info) {
                        NDR_PULL_ALLOC(ndr, r->info);
index 466f9c32e15eaa4b8042a7c8bbb5dd8b048d1463..dc2a0673c6012a9ef423cfbfdf458d2c99eae818 100644 (file)
@@ -438,7 +438,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsBindInfoCtr(struct ndr_print *ndr, const char
 _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaObjectIdentifier(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaObjectIdentifier *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, strlen_m(r->dn) + 1));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, strlen_m(r->dn) + 1));
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->iconv_convenience, ndr->flags) - 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_dom_sid28(&r->sid, ndr->flags)));
@@ -540,7 +540,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaSyncOptions(struct ndr_print *ndr, cons
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaSyncRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaSyncRequest1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->naming_context));
                NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->source_dsa_guid));
                {
@@ -574,7 +574,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaSyncRequest1(struct ndr_pull
        uint32_t _ptr_other_info;
        TALLOC_CTX *_mem_save_other_info_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -786,7 +786,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaCursorCtrEx(struct ndr_push *
 {
        uint32_t cntr_cursors_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_align(ndr, 8));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 1));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -894,7 +894,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsExtendedOperation(struct ndr_push *n
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+               NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
                ndr->flags = _flags_save_ENUM;
        }
        return NDR_ERR_SUCCESS;
@@ -906,7 +906,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsExtendedOperation(struct ndr_pull *n
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+               NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
                *r = v;
                ndr->flags = _flags_save_ENUM;
        }
@@ -940,7 +940,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsExtendedError(struct ndr_push *ndr,
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+               NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
                ndr->flags = _flags_save_ENUM;
        }
        return NDR_ERR_SUCCESS;
@@ -952,7 +952,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsExtendedError(struct ndr_pull *ndr,
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+               NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
                *r = v;
                ndr->flags = _flags_save_ENUM;
        }
@@ -1103,7 +1103,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaOID(struct ndr_print *ndr, const char *
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaOIDMapping(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaOIDMapping *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->id_prefix));
                NDR_CHECK(ndr_push_drsuapi_DsReplicaOID(ndr, NDR_SCALARS, &r->oid));
        }
@@ -1116,7 +1116,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaOIDMapping(struct ndr_push *n
 static enum ndr_err_code ndr_pull_drsuapi_DsReplicaOIDMapping(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsReplicaOIDMapping *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->id_prefix));
                NDR_CHECK(ndr_pull_drsuapi_DsReplicaOID(ndr, NDR_SCALARS, &r->oid));
        }
@@ -1139,13 +1139,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaOIDMapping_Ctr(struct ndr_p
 {
        uint32_t cntr_mappings_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_mappings));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->mappings));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->mappings) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_mappings));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_mappings));
                        for (cntr_mappings_1 = 0; cntr_mappings_1 < r->num_mappings; cntr_mappings_1++) {
                                NDR_CHECK(ndr_push_drsuapi_DsReplicaOIDMapping(ndr, NDR_SCALARS, &r->mappings[cntr_mappings_1]));
                        }
@@ -1164,7 +1164,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(struct ndr_p
        TALLOC_CTX *_mem_save_mappings_0;
        TALLOC_CTX *_mem_save_mappings_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_mappings));
                if (r->num_mappings > 0x100000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@ -1229,7 +1229,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsAttributeId(struct ndr_push *ndr,
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+               NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
                ndr->flags = _flags_save_ENUM;
        }
        return NDR_ERR_SUCCESS;
@@ -1241,7 +1241,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsAttributeId(struct ndr_pull *ndr,
        {
                uint32_t _flags_save_ENUM = ndr->flags;
                ndr_set_flags(&ndr->flags, LIBNDR_PRINT_ARRAY_HEX);
-               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+               NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
                *r = v;
                ndr->flags = _flags_save_ENUM;
        }
@@ -1335,7 +1335,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsPartialAttributeSet(struct ndr_push
 {
        uint32_t cntr_attids_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_attids));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_attids));
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 1));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -1548,6 +1548,158 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesRequest8(struct ndr_print *ndr, co
        ndr->depth--;
 }
 
+static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest10(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 8));
+               NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->destination_dsa_guid));
+               NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS, &r->source_dsa_invocation_id));
+               if (r->naming_context == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_ref_ptr(ndr));
+               NDR_CHECK(ndr_push_drsuapi_DsReplicaHighWaterMark(ndr, NDR_SCALARS, &r->highwatermark));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->uptodateness_vector));
+               NDR_CHECK(ndr_push_drsuapi_DsReplicaNeighbourFlags(ndr, NDR_SCALARS, r->replica_flags));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->max_object_count));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->max_ndr_size));
+               NDR_CHECK(ndr_push_drsuapi_DsExtendedOperation(ndr, NDR_SCALARS, r->extended_op));
+               NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->fsmo_info));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->partial_attribute_set));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->partial_attribute_set_ex));
+               NDR_CHECK(ndr_push_drsuapi_DsReplicaOIDMapping_Ctr(ndr, NDR_SCALARS, &r->mapping_ctr));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->more_flags));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
+               if (r->uptodateness_vector) {
+                       NDR_CHECK(ndr_push_drsuapi_DsReplicaCursorCtrEx(ndr, NDR_SCALARS, r->uptodateness_vector));
+               }
+               if (r->partial_attribute_set) {
+                       NDR_CHECK(ndr_push_drsuapi_DsPartialAttributeSet(ndr, NDR_SCALARS, r->partial_attribute_set));
+               }
+               if (r->partial_attribute_set_ex) {
+                       NDR_CHECK(ndr_push_drsuapi_DsPartialAttributeSet(ndr, NDR_SCALARS, r->partial_attribute_set_ex));
+               }
+               NDR_CHECK(ndr_push_drsuapi_DsReplicaOIDMapping_Ctr(ndr, NDR_BUFFERS, &r->mapping_ctr));
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesRequest10(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+       uint32_t _ptr_naming_context;
+       TALLOC_CTX *_mem_save_naming_context_0;
+       uint32_t _ptr_uptodateness_vector;
+       TALLOC_CTX *_mem_save_uptodateness_vector_0;
+       uint32_t _ptr_partial_attribute_set;
+       TALLOC_CTX *_mem_save_partial_attribute_set_0;
+       uint32_t _ptr_partial_attribute_set_ex;
+       TALLOC_CTX *_mem_save_partial_attribute_set_ex_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 8));
+               NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->destination_dsa_guid));
+               NDR_CHECK(ndr_pull_GUID(ndr, NDR_SCALARS, &r->source_dsa_invocation_id));
+               NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
+               if (_ptr_naming_context) {
+                       NDR_PULL_ALLOC(ndr, r->naming_context);
+               } else {
+                       r->naming_context = NULL;
+               }
+               NDR_CHECK(ndr_pull_drsuapi_DsReplicaHighWaterMark(ndr, NDR_SCALARS, &r->highwatermark));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_uptodateness_vector));
+               if (_ptr_uptodateness_vector) {
+                       NDR_PULL_ALLOC(ndr, r->uptodateness_vector);
+               } else {
+                       r->uptodateness_vector = NULL;
+               }
+               NDR_CHECK(ndr_pull_drsuapi_DsReplicaNeighbourFlags(ndr, NDR_SCALARS, &r->replica_flags));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_object_count));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->max_ndr_size));
+               NDR_CHECK(ndr_pull_drsuapi_DsExtendedOperation(ndr, NDR_SCALARS, &r->extended_op));
+               NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->fsmo_info));
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_partial_attribute_set));
+               if (_ptr_partial_attribute_set) {
+                       NDR_PULL_ALLOC(ndr, r->partial_attribute_set);
+               } else {
+                       r->partial_attribute_set = NULL;
+               }
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_partial_attribute_set_ex));
+               if (_ptr_partial_attribute_set_ex) {
+                       NDR_PULL_ALLOC(ndr, r->partial_attribute_set_ex);
+               } else {
+                       r->partial_attribute_set_ex = NULL;
+               }
+               NDR_CHECK(ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(ndr, NDR_SCALARS, &r->mapping_ctr));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->more_flags));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+               _mem_save_naming_context_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->naming_context, 0);
+               NDR_CHECK(ndr_pull_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_naming_context_0, 0);
+               if (r->uptodateness_vector) {
+                       _mem_save_uptodateness_vector_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->uptodateness_vector, 0);
+                       NDR_CHECK(ndr_pull_drsuapi_DsReplicaCursorCtrEx(ndr, NDR_SCALARS, r->uptodateness_vector));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_uptodateness_vector_0, 0);
+               }
+               if (r->partial_attribute_set) {
+                       _mem_save_partial_attribute_set_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->partial_attribute_set, 0);
+                       NDR_CHECK(ndr_pull_drsuapi_DsPartialAttributeSet(ndr, NDR_SCALARS, r->partial_attribute_set));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_partial_attribute_set_0, 0);
+               }
+               if (r->partial_attribute_set_ex) {
+                       _mem_save_partial_attribute_set_ex_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->partial_attribute_set_ex, 0);
+                       NDR_CHECK(ndr_pull_drsuapi_DsPartialAttributeSet(ndr, NDR_SCALARS, r->partial_attribute_set_ex));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_partial_attribute_set_ex_0, 0);
+               }
+               NDR_CHECK(ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(ndr, NDR_BUFFERS, &r->mapping_ctr));
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesRequest10(struct ndr_print *ndr, const char *name, const struct drsuapi_DsGetNCChangesRequest10 *r)
+{
+       ndr_print_struct(ndr, name, "drsuapi_DsGetNCChangesRequest10");
+       ndr->depth++;
+       ndr_print_GUID(ndr, "destination_dsa_guid", &r->destination_dsa_guid);
+       ndr_print_GUID(ndr, "source_dsa_invocation_id", &r->source_dsa_invocation_id);
+       ndr_print_ptr(ndr, "naming_context", r->naming_context);
+       ndr->depth++;
+       ndr_print_drsuapi_DsReplicaObjectIdentifier(ndr, "naming_context", r->naming_context);
+       ndr->depth--;
+       ndr_print_drsuapi_DsReplicaHighWaterMark(ndr, "highwatermark", &r->highwatermark);
+       ndr_print_ptr(ndr, "uptodateness_vector", r->uptodateness_vector);
+       ndr->depth++;
+       if (r->uptodateness_vector) {
+               ndr_print_drsuapi_DsReplicaCursorCtrEx(ndr, "uptodateness_vector", r->uptodateness_vector);
+       }
+       ndr->depth--;
+       ndr_print_drsuapi_DsReplicaNeighbourFlags(ndr, "replica_flags", r->replica_flags);
+       ndr_print_uint32(ndr, "max_object_count", r->max_object_count);
+       ndr_print_uint32(ndr, "max_ndr_size", r->max_ndr_size);
+       ndr_print_drsuapi_DsExtendedOperation(ndr, "extended_op", r->extended_op);
+       ndr_print_hyper(ndr, "fsmo_info", r->fsmo_info);
+       ndr_print_ptr(ndr, "partial_attribute_set", r->partial_attribute_set);
+       ndr->depth++;
+       if (r->partial_attribute_set) {
+               ndr_print_drsuapi_DsPartialAttributeSet(ndr, "partial_attribute_set", r->partial_attribute_set);
+       }
+       ndr->depth--;
+       ndr_print_ptr(ndr, "partial_attribute_set_ex", r->partial_attribute_set_ex);
+       ndr->depth++;
+       if (r->partial_attribute_set_ex) {
+               ndr_print_drsuapi_DsPartialAttributeSet(ndr, "partial_attribute_set_ex", r->partial_attribute_set_ex);
+       }
+       ndr->depth--;
+       ndr_print_drsuapi_DsReplicaOIDMapping_Ctr(ndr, "mapping_ctr", &r->mapping_ctr);
+       ndr_print_uint32(ndr, "more_flags", r->more_flags);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push *ndr, int ndr_flags, const union drsuapi_DsGetNCChangesRequest *r)
 {
        if (ndr_flags & NDR_SCALARS) {
@@ -1562,6 +1714,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
                                NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest8(ndr, NDR_SCALARS, &r->req8));
                        break; }
 
+                       case 10: {
+                               NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest10(ndr, NDR_SCALARS, &r->req10));
+                       break; }
+
                        default:
                                return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__);
                }
@@ -1577,6 +1733,10 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesRequest(struct ndr_push
                                NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest8(ndr, NDR_BUFFERS, &r->req8));
                        break;
 
+                       case 10:
+                               NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesRequest10(ndr, NDR_BUFFERS, &r->req10));
+                       break;
+
                        default:
                                return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__);
                }
@@ -1603,6 +1763,10 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesRequest(struct ndr_pull
                                NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest8(ndr, NDR_SCALARS, &r->req8));
                        break; }
 
+                       case 10: {
+                               NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest10(ndr, NDR_SCALARS, &r->req10));
+                       break; }
+
                        default:
                                return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__);
                }
@@ -1617,6 +1781,10 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesRequest(struct ndr_pull
                                NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest8(ndr, NDR_BUFFERS, &r->req8));
                        break;
 
+                       case 10:
+                               NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesRequest10(ndr, NDR_BUFFERS, &r->req10));
+                       break;
+
                        default:
                                return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__);
                }
@@ -1638,6 +1806,10 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesRequest(struct ndr_print *ndr, con
                        ndr_print_drsuapi_DsGetNCChangesRequest8(ndr, "req8", &r->req8);
                break;
 
+               case 10:
+                       ndr_print_drsuapi_DsGetNCChangesRequest10(ndr, "req10", &r->req10);
+               break;
+
                default:
                        ndr_print_bad_level(ndr, name, level);
        }
@@ -1683,7 +1855,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaCursor2CtrEx(struct ndr_push
 {
        uint32_t cntr_cursors_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_align(ndr, 8));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -1753,7 +1925,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaCursor2CtrEx(struct ndr_print *ndr, con
 static enum ndr_err_code ndr_push_drsuapi_DsAttributeValue(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsAttributeValue *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_DATA_BLOB(0, r->blob, 0)));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->blob));
        }
@@ -1770,7 +1942,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAttributeValue(struct ndr_pull *ndr,
        uint32_t _ptr_blob;
        TALLOC_CTX *_mem_save_blob_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->__ndr_size));
                if (r->__ndr_size > 10485760) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@ -1811,13 +1983,13 @@ static enum ndr_err_code ndr_push_drsuapi_DsAttributeValueCtr(struct ndr_push *n
 {
        uint32_t cntr_values_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_values));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->values));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->values) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_values));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_values));
                        for (cntr_values_1 = 0; cntr_values_1 < r->num_values; cntr_values_1++) {
                                NDR_CHECK(ndr_push_drsuapi_DsAttributeValue(ndr, NDR_SCALARS, &r->values[cntr_values_1]));
                        }
@@ -1836,7 +2008,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsAttributeValueCtr(struct ndr_pull *n
        TALLOC_CTX *_mem_save_values_0;
        TALLOC_CTX *_mem_save_values_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_values));
                if (r->num_values > 10485760) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@ -2019,7 +2191,7 @@ _PUBLIC_ size_t ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary(const struct d
 _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaAttribute(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaAttribute *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_drsuapi_DsAttributeId(ndr, NDR_SCALARS, r->attid));
                NDR_CHECK(ndr_push_drsuapi_DsAttributeValueCtr(ndr, NDR_SCALARS, &r->value_ctr));
        }
@@ -2032,7 +2204,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaAttribute(struct ndr_push *
 _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaAttribute(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsReplicaAttribute *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_drsuapi_DsAttributeId(ndr, NDR_SCALARS, &r->attid));
                NDR_CHECK(ndr_pull_drsuapi_DsAttributeValueCtr(ndr, NDR_SCALARS, &r->value_ctr));
        }
@@ -2055,13 +2227,13 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAttributeCtr(struct ndr_push
 {
        uint32_t cntr_attributes_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_attributes));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->attributes));
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->attributes) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_attributes));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_attributes));
                        for (cntr_attributes_1 = 0; cntr_attributes_1 < r->num_attributes; cntr_attributes_1++) {
                                NDR_CHECK(ndr_push_drsuapi_DsReplicaAttribute(ndr, NDR_SCALARS, &r->attributes[cntr_attributes_1]));
                        }
@@ -2080,7 +2252,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAttributeCtr(struct ndr_pull
        TALLOC_CTX *_mem_save_attributes_0;
        TALLOC_CTX *_mem_save_attributes_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_attributes));
                if (r->num_attributes > 1048576) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@ -2167,7 +2339,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaObjectFlags(struct ndr_print *ndr, cons
 _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaObject(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaObject *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->identifier));
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectFlags(ndr, NDR_SCALARS, r->flags));
                NDR_CHECK(ndr_push_drsuapi_DsReplicaAttributeCtr(ndr, NDR_SCALARS, &r->attribute_ctr));
@@ -2186,7 +2358,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaObject(struct ndr_pull *ndr
        uint32_t _ptr_identifier;
        TALLOC_CTX *_mem_save_identifier_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_identifier));
                if (_ptr_identifier) {
                        NDR_PULL_ALLOC(ndr, r->identifier);
@@ -2266,7 +2438,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaMetaDataCtr(struct ndr_push
 {
        uint32_t cntr_meta_data_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_align(ndr, 8));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                for (cntr_meta_data_0 = 0; cntr_meta_data_0 < r->count; cntr_meta_data_0++) {
@@ -2327,7 +2499,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaMetaDataCtr(struct ndr_print *ndr, cons
 _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsReplicaObjectListItemEx(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaObjectListItemEx *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->next_object));
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObject(ndr, NDR_SCALARS, &r->object));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->is_nc_prefix));
@@ -2358,7 +2530,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_drsuapi_DsReplicaObjectListItemEx(struct ndr
        uint32_t _ptr_meta_data_ctr;
        TALLOC_CTX *_mem_save_meta_data_ctr_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_next_object));
                if (_ptr_next_object) {
                        NDR_PULL_ALLOC(ndr, r->next_object);
@@ -2662,7 +2834,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr6(struct ndr_push *
                        NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectListItemEx(ndr, NDR_SCALARS|NDR_BUFFERS, r->first_object));
                }
                if (r->linked_attributes) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->linked_attributes_count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->linked_attributes_count));
                        for (cntr_linked_attributes_1 = 0; cntr_linked_attributes_1 < r->linked_attributes_count; cntr_linked_attributes_1++) {
                                NDR_CHECK(ndr_push_drsuapi_DsReplicaLinkedAttribute(ndr, NDR_SCALARS, &r->linked_attributes[cntr_linked_attributes_1]));
                        }
@@ -2916,7 +3088,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesMSZIPCtr1(struct ndr_pul
        uint32_t _ptr_ts;
        TALLOC_CTX *_mem_save_ts_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->decompressed_length));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->compressed_length));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ts));
@@ -2967,7 +3139,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesMSZIPCtr6(struct ndr_pul
        uint32_t _ptr_ts;
        TALLOC_CTX *_mem_save_ts_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->decompressed_length));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->compressed_length));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ts));
@@ -3018,7 +3190,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesXPRESSCtr1(struct ndr_pu
        uint32_t _ptr_ts;
        TALLOC_CTX *_mem_save_ts_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->decompressed_length));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->compressed_length));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ts));
@@ -3069,7 +3241,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesXPRESSCtr6(struct ndr_pu
        uint32_t _ptr_ts;
        TALLOC_CTX *_mem_save_ts_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->decompressed_length));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->compressed_length));
                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ts));
@@ -3117,14 +3289,14 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesXPRESSCtr6(struct ndr_print *ndr,
 
 static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCompressionType(struct ndr_push *ndr, int ndr_flags, enum drsuapi_DsGetNCChangesCompressionType r)
 {
-       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint16(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCompressionType(struct ndr_pull *ndr, int ndr_flags, enum drsuapi_DsGetNCChangesCompressionType *r)
 {
        uint16_t v;
-       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint16(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -3287,7 +3459,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesCompressedCtr(struct ndr_print *nd
 static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr2(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsGetNCChangesCtr2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesMSZIPCtr1(ndr, NDR_SCALARS, &r->mszip1));
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -3299,7 +3471,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr2(struct ndr_push *nd
 static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCtr2(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsGetNCChangesCtr2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_drsuapi_DsGetNCChangesMSZIPCtr1(ndr, NDR_SCALARS, &r->mszip1));
        }
        if (ndr_flags & NDR_BUFFERS) {
@@ -3319,7 +3491,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsGetNCChangesCtr2(struct ndr_print *ndr, const
 static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr7(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsGetNCChangesCtr7 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->level));
                NDR_CHECK(ndr_push_drsuapi_DsGetNCChangesCompressionType(ndr, NDR_SCALARS, r->type));
                NDR_CHECK(ndr_push_set_switch_value(ndr, &r->ctr, r->level | (r->type << 16)));
@@ -3334,7 +3506,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetNCChangesCtr7(struct ndr_push *nd
 static enum ndr_err_code ndr_pull_drsuapi_DsGetNCChangesCtr7(struct ndr_pull *ndr, int ndr_flags, struct drsuapi_DsGetNCChangesCtr7 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->level));
                if (r->level < 0 || r->level > 6) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@ -3527,7 +3699,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaUpdateRefsOptions(struct ndr_print *ndr
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaUpdateRefsRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaUpdateRefsRequest1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                if (r->naming_context == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -3541,9 +3713,9 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaUpdateRefsRequest1(struct ndr
        }
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dest_dsa_dns_name, CH_DOS)));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->dest_dsa_dns_name, CH_DOS)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dest_dsa_dns_name, CH_DOS)));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->dest_dsa_dns_name, CH_DOS)));
                NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->dest_dsa_dns_name, ndr_charset_length(r->dest_dsa_dns_name, CH_DOS), sizeof(uint8_t), CH_DOS));
        }
        return NDR_ERR_SUCCESS;
@@ -3555,7 +3727,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaUpdateRefsRequest1(struct ndr
        TALLOC_CTX *_mem_save_naming_context_0;
        uint32_t _ptr_dest_dsa_dns_name;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -3705,7 +3877,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaAddOptions(struct ndr_print *ndr, const
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaAddRequest1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                if (r->naming_context == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -3717,9 +3889,9 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest1(struct ndr_push *
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
                if (r->source_dsa_address) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->source_dsa_address, ndr_charset_length(r->source_dsa_address, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -3733,7 +3905,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAddRequest1(struct ndr_pull *
        uint32_t _ptr_source_dsa_address;
        TALLOC_CTX *_mem_save_source_dsa_address_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -3792,7 +3964,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaAddRequest1(struct ndr_print *ndr, cons
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest2(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaAddRequest2 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                if (r->naming_context == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -3812,9 +3984,9 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaAddRequest2(struct ndr_push *
                        NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->transport_dn));
                }
                if (r->source_dsa_address) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->source_dsa_address, ndr_charset_length(r->source_dsa_address, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -3832,7 +4004,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaAddRequest2(struct ndr_pull *
        uint32_t _ptr_source_dsa_address;
        TALLOC_CTX *_mem_save_source_dsa_address_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -4045,7 +4217,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaDeleteOptions(struct ndr_print *ndr, co
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaDelRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaDelRequest1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                if (r->naming_context == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -4056,9 +4228,9 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaDelRequest1(struct ndr_push *
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
                if (r->source_dsa_address) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dsa_address, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->source_dsa_address, ndr_charset_length(r->source_dsa_address, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -4072,7 +4244,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaDelRequest1(struct ndr_pull *
        uint32_t _ptr_source_dsa_address;
        TALLOC_CTX *_mem_save_source_dsa_address_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -4227,7 +4399,7 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaModifyOptions(struct ndr_print *ndr, co
 static enum ndr_err_code ndr_push_drsuapi_DsReplicaModRequest1(struct ndr_push *ndr, int ndr_flags, const struct drsuapi_DsReplicaModRequest1 *r)
 {
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                if (r->naming_context == NULL) {
                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                }
@@ -4242,9 +4414,9 @@ static enum ndr_err_code ndr_push_drsuapi_DsReplicaModRequest1(struct ndr_push *
        if (ndr_flags & NDR_BUFFERS) {
                NDR_CHECK(ndr_push_drsuapi_DsReplicaObjectIdentifier(ndr, NDR_SCALARS|NDR_BUFFERS, r->naming_context));
                if (r->source_dra_address) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dra_address, CH_UTF16)));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->source_dra_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dra_address, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, ndr_charset_length(r->source_dra_address, CH_UTF16)));
                        NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->source_dra_address, ndr_charset_length(r->source_dra_address, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                }
        }
@@ -4258,7 +4430,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsReplicaModRequest1(struct ndr_pull *
        uint32_t _ptr_source_dra_address;
        TALLOC_CTX *_mem_save_source_dra_address_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_ref_ptr(ndr, &_ptr_naming_context));
                if (_ptr_naming_context) {
                        NDR_PULL_ALLOC(ndr, r->naming_context);
@@ -4397,14 +4569,14 @@ _PUBLIC_ void ndr_print_drsuapi_DsReplicaModRequest(struct ndr_print *ndr, const
 
 static enum ndr_err_code ndr_push_drsuapi_DsMembershipType(struct ndr_push *ndr, int ndr_flags, enum drsuapi_DsMembershipType r)
 {
-       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+       NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
        return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_drsuapi_DsMembershipType(struct ndr_pull *ndr, int ndr_flags, enum drsuapi_DsMembershipType *r)
 {
        uint32_t v;
-       NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+       NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
        *r = v;
        return NDR_ERR_SUCCESS;
 }
@@ -4431,7 +4603,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsCtr1(struct ndr_push *
        uint32_t cntr_group_attrs_1;
        uint32_t cntr_sids_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->status));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_memberships));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_sids));
@@ -4441,7 +4613,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsCtr1(struct ndr_push *
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->info_array) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_memberships));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_memberships));
                        for (cntr_info_array_1 = 0; cntr_info_array_1 < r->num_memberships; cntr_info_array_1++) {
                                NDR_CHECK(ndr_push_unique_ptr(ndr, r->info_array[cntr_info_array_1]));
                        }
@@ -4452,13 +4624,13 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsCtr1(struct ndr_push *
                        }
                }
                if (r->group_attrs) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_memberships));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_memberships));
                        for (cntr_group_attrs_1 = 0; cntr_group_attrs_1 < r->num_memberships; cntr_group_attrs_1++) {
                                NDR_CHECK(ndr_push_samr_GroupAttrs(ndr, NDR_SCALARS, r->group_attrs[cntr_group_attrs_1]));
                        }
                }
                if (r->sids) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_sids));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->num_sids));
                        for (cntr_sids_1 = 0; cntr_sids_1 < r->num_sids; cntr_sids_1++) {
                                NDR_CHECK(ndr_push_unique_ptr(ndr, r->sids[cntr_sids_1]));
                        }
@@ -4489,7 +4661,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMembershipsCtr1(struct ndr_pull *
        TALLOC_CTX *_mem_save_sids_1;
        TALLOC_CTX *_mem_save_sids_2;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->status));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_memberships));
                if (r->num_memberships > 10000) {
@@ -4744,7 +4916,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsRequest1(struct ndr_pu
 {
        uint32_t cntr_info_array_1;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_align(ndr, 5));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
                NDR_CHECK(ndr_push_unique_ptr(ndr, r->info_array));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags));
@@ -4753,7 +4925,7 @@ static enum ndr_err_code ndr_push_drsuapi_DsGetMembershipsRequest1(struct ndr_pu
        }
        if (ndr_flags & NDR_BUFFERS) {
                if (r->info_array) {
-                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->count));
+                       NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->count));
                        for (cntr_info_array_1 = 0; cntr_info_array_1 < r->count; cntr_info_array_1++) {
                                NDR_CHECK(ndr_push_unique_ptr(ndr, r->info_array[cntr_info_array_1]));
                        }
@@ -4780,7 +4952,7 @@ static enum ndr_err_code ndr_pull_drsuapi_DsGetMembershipsRequest1(struct ndr_pu
        uint32_t _ptr_domain;
        TALLOC_CTX *_mem_save_domain_0;
        if (ndr_flags & NDR_SCALARS) {
-               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_align(ndr, 5));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
                if (r->count < 1 || r->count > 10000) {
                        return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of range");
@@