Changeset 988 for vendor/current/librpc/idl

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/librpc/idl

Files:

• auth.idl (modified) (6 diffs)
• backupkey.idl (modified) (2 diffs)
• bkupblobs.idl (added)
• clusapi.idl (added)
• dcerpc.idl (modified) (10 diffs)
• dcom.idl (modified) (17 diffs)
• dfsblobs.idl (modified) (3 diffs)
• dns.idl (modified) (9 diffs)
• dnsp.idl (modified) (7 diffs)
• dnsserver.idl (modified) (1 diff)
• drsblobs.idl (modified) (4 diffs)
• drsuapi.idl (modified) (13 diffs)
• epmapper.idl (modified) (2 diffs)
• eventlog6.idl (modified) (1 diff)
• frsblobs.idl (added)
• frsrpc.idl (modified) (12 diffs)
• frstrans.idl (modified) (3 diffs)
• fscc.idl (added)
• fsrvp.idl (added)
• fsrvp_state.idl (added)
• idl_types.h (modified) (2 diffs)
• idmap.idl (modified) (1 diff)
• ioctl.idl (added)
• krb5pac.idl (modified) (5 diffs)
• lsa.idl (modified) (11 diffs)
• mdssvc.idl (added)
• messaging.idl (added)
• misc.idl (modified) (1 diff)
• nbt.idl (modified) (6 diffs)
• negoex.idl (added)
• netlogon.idl (modified) (14 diffs)
• nfs4acl.idl (added)
• notify.idl (added)
• ntlmssp.idl (modified) (9 diffs)
• orpc.idl (modified) (12 diffs)
• oxidresolver.idl (modified) (7 diffs)
• preg.idl (modified) (1 diff)
• remact.idl (modified) (2 diffs)
• rot.idl (modified) (1 diff)
• samr.idl (modified) (1 diff)
• schannel.idl (modified) (1 diff)
• security.idl (modified) (12 diffs)
• server_id.idl (added)
• smb2_lease_struct.idl (added)
• smb_acl.idl (added)
• spoolss.idl (modified) (44 diffs)
• srvsvc.idl (modified) (2 diffs)
• svcctl.idl (modified) (2 diffs)
• winbind.idl (added)
• winreg.idl (modified) (1 diff)
• witness.idl (added)
• wmi.idl (modified) (4 diffs)
• wscript_build (modified) (3 diffs)
• xattr.idl (modified) (3 diffs)

vendor/current/librpc/idl/auth.idl

@@ -2 +2 @@
 
 /*
-  security IDL structures
+  Authentication IDL structures
+
+  These are NOT public network structures, but it is helpful to define
+  these things in IDL. They may change without ABI breakage or
+  warning.
+
 */
 
 import "misc.idl", "security.idl", "lsa.idl", "krb5pac.idl";
+[
+        pyhelper("librpc/ndr/py_auth.c"),
+        helper("../librpc/ndr/ndr_auth.h"),
+        helpstring("internal Samba authentication structures")
+]
 
 interface auth
@@ -18 +28 @@
          * during local privilage and group manipulations */
         typedef [public] struct {
-                utf8string account_name;
-                utf8string domain_name;
+                [unique,charset(UTF8),string] char *account_name;
+                [unique,charset(UTF8),string] char *domain_name;
 
-                utf8string full_name;
-                utf8string logon_script;
-                utf8string profile_path;
-                utf8string home_directory;
-                utf8string home_drive;
-                utf8string logon_server;
+                [unique,charset(UTF8),string] char *full_name;
+                [unique,charset(UTF8),string] char *logon_script;
+                [unique,charset(UTF8),string] char *profile_path;
+                [unique,charset(UTF8),string] char *home_directory;
+                [unique,charset(UTF8),string] char *home_drive;
+                [unique,charset(UTF8),string] char *logon_server;
 
                 NTTIME last_logon;
@@ -48 +58 @@
                 uint32 num_dc_sids;
                 [size_is(num_dc_sids)] dom_sid dc_sids[*];
-                PAC_SIGNATURE_DATA *pac_srv_sig;
-                PAC_SIGNATURE_DATA *pac_kdc_sig;
         } auth_user_info_torture;
 
         typedef [public] struct {
-                utf8string unix_name;
+                [unique,charset(UTF8),string] char *unix_name;
 
                 /*
@@ -62 +70 @@
                  * smb request. See set_current_user_info in source3.
                  */
-                utf8string sanitized_username;
+                [unique,charset(UTF8),string] char *sanitized_username;
         } auth_user_info_unix;
 
@@ -71 +79 @@
                 [size_is(num_sids)] dom_sid sids[*];
                 auth_user_info *info;
-                DATA_BLOB user_session_key;
-                DATA_BLOB lm_session_key;
+                [noprint] DATA_BLOB user_session_key;
+                [noprint] DATA_BLOB lm_session_key;
         } auth_user_info_dc;
 
@@ -80 +88 @@
                 auth_user_info *info;
                 auth_user_info_unix *unix_info;
-                DATA_BLOB session_key;
-                DATA_BLOB exported_gssapi_credentials;
+                [value(NULL), ignore] auth_user_info_torture *torture;
+
+                /* This is the final session key, as used by SMB signing, and
+                 * (truncated to 16 bytes) encryption on the SAMR and LSA pipes
+                 * when over ncacn_np.
+                 * It is calculated by NTLMSSP from the session key in the info3,
+                 * and is  set from the Kerberos session key using
+                 * krb5_auth_con_getremotesubkey().
+                 *
+                 * Bottom line, it is not the same as the session keys in info3.
+                 */
+
+                [noprint] DATA_BLOB session_key;
+
+                [value(NULL), ignore] cli_credentials *credentials;
+        } auth_session_info;
+
+        typedef [public] struct {
+                auth_session_info *session_info;
+                [noprint] DATA_BLOB exported_gssapi_credentials;
         } auth_session_info_transport;
 }

vendor/current/librpc/idl/backupkey.idl

@@ -48 +48 @@
         } bkrp_dc_serverwrap_key;
 
+        [public] typedef struct {
+        } bkrp_empty;
+
         [public,gensize] typedef struct {
                 uint32 version;
@@ -96 +99 @@
         } bkrp_access_check_v3;
 
+        [public] typedef struct {
+                uint8 r3[32];
+                uint8 mac[20];
+                dom_sid sid;
+                [subcontext(0),flag(NDR_REMAINING)] DATA_BLOB secret_data;
+        } bkrp_rc4encryptedpayload;
+
+        [public] typedef struct {
+                [value(0x00000001)] uint32 magic;
+                uint32 payload_length;
+                uint32 ciphertext_length;
+                GUID guid;
+                uint8 r2[68];
+                uint8 rc4encryptedpayload[ciphertext_length];
+        } bkrp_server_side_wrapped;
+
+        [public] typedef struct {
+                [flag(NDR_REMAINING)] DATA_BLOB opaque;
+        } bkrp_opaque_blob;
+
+        typedef enum {
+                BACKUPKEY_SERVER_WRAP_VERSION = 1,
+                BACKUPKEY_CLIENT_WRAP_VERSION2 = 2,
+                BACKUPKEY_CLIENT_WRAP_VERSION3 = 3
+        } bkrp_versions;
+  
         typedef enum {
                 BACKUPKEY_INVALID_GUID_INTEGER = 0xFFFF,
                 BACKUPKEY_RESTORE_GUID_INTEGER = 0x0000,
-                BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER = 0x0001
+                BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER = 0x0001,
+                BACKUPKEY_RESTORE_GUID_WIN2K_INTEGER = 0x0002,
+                BACKUPKEY_BACKUP_GUID_INTEGER = 0x0003
         } bkrp_guid_to_integer;
 
         [public] typedef [nodiscriminant] union {
                 [case(BACKUPKEY_RESTORE_GUID_INTEGER)] bkrp_client_side_wrapped restore_req;
-                [case(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER)] bkrp_client_side_wrapped cert_req;
+                [case(BACKUPKEY_RETRIEVE_BACKUP_KEY_GUID_INTEGER)] bkrp_empty empty;
+                [case(BACKUPKEY_RESTORE_GUID_WIN2K_INTEGER)] bkrp_server_side_wrapped unsign_req;
+                [case(BACKUPKEY_BACKUP_GUID_INTEGER)] bkrp_opaque_blob sign_req;
         } bkrp_data_in_blob;
 

vendor/current/librpc/idl/dcerpc.idl

@@ -6 +6 @@
   to do it this way
 
-  see http://www.opengroup.org/onlinepubs/9629399/chap12.htm for packet
-  layouts
+  See [C706 - DCE 1.1: Remote Procedure Call] for the OpenGroup
+  DCERPC specification:
+  http://pubs.opengroup.org/onlinepubs/9629399/toc.htm
+
+  See C706 - Chapter 12: RPC PDU Encodings for packet layouts:
+  http://www.opengroup.org/onlinepubs/9629399/chap12.htm
+
+  See also [MS-RPCE] for the Microsoft
+  "Remote Procedure Call Protocol Extensions".
+  http://msdn.microsoft.com/en-us/library/cc243560.aspx
+
 */
 import "misc.idl";
@@ -13 +22 @@
 cpp_quote("extern const uint8_t DCERPC_SEC_VT_MAGIC[8];")
 
+[
+  helper("../librpc/ndr/ndr_dcerpc.h")
+]
 interface dcerpc
 {
@@ -37 +49 @@
 
         typedef [nodiscriminant] union {
+                [case(LIBNDR_FLAG_OBJECT_PRESENT)] GUID object;
                 [default] dcerpc_empty empty;
-                [case(LIBNDR_FLAG_OBJECT_PRESENT)] GUID object;
         } dcerpc_object;
 
@@ -45 +57 @@
                 uint16 context_id;
                 uint16 opnum;
-                [switch_is(ndr->flags & LIBNDR_FLAG_OBJECT_PRESENT)] dcerpc_object object;
+                /*
+                 * NDR_DCERPC_REQUEST_OBJECT_PRESENT
+                 * is defined differently for ndr_dcerpc.c and py_dcerpc.c
+                 */
+                [switch_is(NDR_DCERPC_REQUEST_OBJECT_PRESENT)] dcerpc_object object;
                 [flag(NDR_ALIGN8)]    DATA_BLOB _pad;
                 [flag(NDR_REMAINING)] DATA_BLOB stub_and_verifier;
         } dcerpc_request;
 
-        const int DCERPC_BIND_REASON_ASYNTAX                 = 1;
-        const int DCERPC_BIND_PROVIDER_REJECT                = 2;
-        const int DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED = 4;
-        const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE       = 8;
-
-        typedef struct {
-                uint16 result;
-                uint16 reason;
+        typedef [enum16bit] enum {
+                DCERPC_BIND_ACK_RESULT_ACCEPTANCE          = 0,
+                DCERPC_BIND_ACK_RESULT_USER_REJECTION      = 1,
+                DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION  = 2,
+                DCERPC_BIND_ACK_RESULT_NEGOTIATE_ACK       = 3
+        } dcerpc_bind_ack_result;
+
+        const int DCERPC_BIND_PROVIDER_REJECT =
+                DCERPC_BIND_ACK_RESULT_PROVIDER_REJECTION;
+
+        typedef [enum16bit] enum {
+                DCERPC_BIND_ACK_REASON_NOT_SPECIFIED                   = 0,
+                DCERPC_BIND_ACK_REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED   = 1,
+                DCERPC_BIND_ACK_REASON_TRANSFER_SYNTAXES_NOT_SUPPORTED = 2,
+                DCERPC_BIND_ACK_REASON_LOCAL_LIMIT_EXCEEDED            = 3
+        } dcerpc_bind_ack_reason_values;
+
+        const int DCERPC_BIND_REASON_ASYNTAX =
+                DCERPC_BIND_ACK_REASON_ABSTRACT_SYNTAX_NOT_SUPPORTED;
+
+        typedef [bitmap16bit] bitmap {
+                DCERPC_BIND_TIME_SECURITY_CONTEXT_MULTIPLEXING = 0x0001,
+                DCERPC_BIND_TIME_KEEP_CONNECTION_ON_ORPHAN     = 0x0002
+        } dcerpc_bind_time_features;
+
+        typedef [nodiscriminant] union {
+                [case(DCERPC_BIND_ACK_RESULT_NEGOTIATE_ACK)]
+                        dcerpc_bind_time_features negotiate;
+                [default] dcerpc_bind_ack_reason_values value;
+        } dcerpc_bind_ack_reason;
+
+        typedef struct {
+                dcerpc_bind_ack_result result;
+                [switch_is(result)] dcerpc_bind_ack_reason reason;
                 ndr_syntax_id syntax;
         } dcerpc_ack_ctx;
@@ -65 +107 @@
                 uint16 max_recv_frag;
                 uint32 assoc_group_id;
-                [value(strlen(secondary_address)+1)] uint16 secondary_address_size;
+                [value(strlen_m_term_null(secondary_address))] uint16 secondary_address_size;
                 [charset(DOS)] uint8 secondary_address[secondary_address_size];
                 [flag(NDR_ALIGN4)]    DATA_BLOB _pad1;
@@ -73 +115 @@
         } dcerpc_bind_ack;
 
-        typedef struct {
-                uint32 num_versions;
-                uint32 versions[num_versions];
-        } dcerpc_bind_nak_versions;
-
-        typedef [nodiscriminant] union {
-                [case(DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED)] dcerpc_bind_nak_versions v;
-                [default] ;
-        } dcerpc_bind_nak_versions_ctr;
-
-        typedef struct {
-                uint16 reject_reason;
-                [switch_is(reject_reason)] dcerpc_bind_nak_versions_ctr versions;
+        typedef [public,enum16bit] enum {
+                DCERPC_BIND_NAK_REASON_NOT_SPECIFIED                  = 0,
+                DCERPC_BIND_NAK_REASON_TEMPORARY_CONGESTION           = 1,
+                DCERPC_BIND_NAK_REASON_LOCAL_LIMIT_EXCEEDED           = 2,
+                DCERPC_BIND_NAK_REASON_PROTOCOL_VERSION_NOT_SUPPORTED = 4,
+                DCERPC_BIND_NAK_REASON_INVALID_AUTH_TYPE              = 8,
+                DCERPC_BIND_NAK_REASON_INVALID_CHECKSUM               = 9
+        } dcerpc_bind_nak_reason;
+
+        const int DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED =
+                DCERPC_BIND_NAK_REASON_PROTOCOL_VERSION_NOT_SUPPORTED;
+        const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE =
+                DCERPC_BIND_NAK_REASON_INVALID_AUTH_TYPE;
+
+        typedef [public] struct {
+                uint8 rpc_vers;         /* RPC version */
+                uint8 rpc_vers_minor;   /* Minor version */
+        } dcerpc_bind_nak_version;
+
+        typedef [public,nopull] struct {
+                dcerpc_bind_nak_reason reject_reason;
+                uint8 num_versions;
+                dcerpc_bind_nak_version versions[num_versions];
+                [flag(NDR_REMAINING)] DATA_BLOB _pad;
         } dcerpc_bind_nak;
 
@@ -145 +198 @@
                 DCERPC_NCA_S_FAULT_CODESET_CONV_ERROR   = 0x1C000023,
                 DCERPC_NCA_S_FAULT_OBJECT_NOT_FOUND     = 0x1C000024,
-                DCERPC_NCA_S_FAULT_NO_CLIENT_STUB       = 0x1C000025
+                DCERPC_NCA_S_FAULT_NO_CLIENT_STUB       = 0x1C000025,
+                DCERPC_FAULT_ACCESS_DENIED              = 0x00000005,
+                DCERPC_FAULT_NO_CALL_ACTIVE             = 0x000006bd,
+                DCERPC_FAULT_CANT_PERFORM               = 0x000006d8,
+                DCERPC_FAULT_OUT_OF_RESOURCES           = 0x000006d9,
+                DCERPC_FAULT_BAD_STUB_DATA              = 0x000006f7,
+                DCERPC_FAULT_SEC_PKG_ERROR              = 0x00000721
         } dcerpc_nca_status;
 
-        const int DCERPC_FAULT_OP_RNG_ERROR       = 0x1c010002;
-        const int DCERPC_FAULT_UNK_IF             = 0x1c010003;
-        const int DCERPC_FAULT_NDR                = 0x000006f7;
-        const int DCERPC_FAULT_INVALID_TAG        = 0x1c000006;
-        const int DCERPC_FAULT_CONTEXT_MISMATCH   = 0x1c00001a;
+        const int DCERPC_FAULT_OP_RNG_ERROR       = DCERPC_NCA_S_OP_RNG_ERROR;
+        const int DCERPC_FAULT_UNK_IF             = DCERPC_NCA_S_UNKNOWN_IF;
+        const int DCERPC_FAULT_NDR                = DCERPC_FAULT_BAD_STUB_DATA;
+        const int DCERPC_FAULT_INVALID_TAG        = DCERPC_NCA_S_FAULT_INVALID_TAG;
+        const int DCERPC_FAULT_CONTEXT_MISMATCH   = DCERPC_NCA_S_FAULT_CONTEXT_MISMATCH;
         const int DCERPC_FAULT_OTHER              = 0x00000001;
-        const int DCERPC_FAULT_ACCESS_DENIED      = 0x00000005;
-        const int DCERPC_FAULT_CANT_PERFORM       = 0x000006d8;
-        const int DCERPC_FAULT_SEC_PKG_ERROR      = 0x00000721;
 
         /* we return this fault when we haven't yet run the test
@@ -207 +263 @@
 
         const uint8 DCERPC_AUTH_TRAILER_LENGTH = 8;
+        const uint8 DCERPC_AUTH_PAD_ALIGNMENT = 16;
 
         typedef [public] struct {
@@ -469 +526 @@
         const int DCERPC_PFC_FLAG_PENDING_CANCEL =
                 DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
-        const ist DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN =
+        const int DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN =
                 DCERPC_PFC_FLAG_PENDING_CANCEL_OR_HDR_SIGNING;
 
@@ -478 +535 @@
         const uint32 DCERPC_FRAG_MAX_SIZE  = 5840;
         const uint8 DCERPC_AUTH_LEN_OFFSET = 10;
-        const uint8 DCERPC_CALL_ID_OFFSET  = 12;
         const uint8 DCERPC_NCACN_PAYLOAD_OFFSET = 16;
         const uint32 DCERPC_NCACN_PAYLOAD_MAX_SIZE = 0x400000; /* 4 MByte */

vendor/current/librpc/idl/dcom.idl

@@ -27 +27 @@
         /*****************/
         /* Function 0x00 */
-        /* Returns the interface with the specified IID 
+        /* Returns the interface with the specified IID
            if implemented by this object */
-        [local] WERROR QueryInterface([in,unique] GUID *iid,
-           [out,iid_is(riid)] IUnknown **data);
+        [local] WERROR QueryInterface(
+                [in,unique] GUID *iid,
+                [out,iid_is(riid)] IUnknown **data
+                );
 
         /*****************/
@@ -48 +50 @@
 ] interface IClassFactory : IUnknown
 {
-        [local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown, 
-                               [in,unique] GUID *iid,
-                               [out, iid_is(riid),unique] MInterfacePointer *ppv);
+        [local] WERROR CreateInstance(
+                [in,unique] MInterfacePointer *pUnknown,
+                [in,unique] GUID *iid,
+                [out, iid_is(riid),unique] MInterfacePointer *ppv
+                );
 
         [call_as(CreateInstance)] WERROR RemoteCreateInstance();
@@ -56 +60 @@
         /* Set lock to TRUE when you want to do a lock
         and set it to FALSE when you want to unlock */
-        [local] WERROR LockServer([in] uint8 lock);
+        [local] WERROR LockServer(
+                [in] uint8 lock
+                );
 
         [call_as(LockServer)] WERROR RemoteLockServer();
@@ -76 +82 @@
 interface IRemUnknown : IUnknown
 {
-        typedef [public] struct 
+        typedef [public] struct
         {
                 WERROR hResult; /* result of call */
@@ -91 +97 @@
                 );
 
-        typedef struct 
+        typedef struct
         {
                 GUID ipid; /* ipid to AddRef/Release */
@@ -99 +105 @@
 
         [call_as(AddRef)] WERROR RemAddRef (
-                 [in] uint16 cInterfaceRefs,
-                 [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
-                 [out, size_is(cInterfaceRefs), unique] WERROR *pResults
+                [in] uint16 cInterfaceRefs,
+                [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
+                [out, size_is(cInterfaceRefs), unique] WERROR *pResults
                 );
 
         [call_as(Release)] WERROR RemRelease (
-                 [in] uint16 cInterfaceRefs,
-                 [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[]
+                [in] uint16 cInterfaceRefs,
+                [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[]
                 );
 }
@@ -115 +121 @@
 ] interface IClassActivator : IUnknown
 {
-        void GetClassObject([in] GUID clsid, 
-                                [in] uint32 context,
-                                                [in] uint32 locale,
-                                                [in] GUID iid,
-                                                [out, iid_is(iid)] MInterfacePointer *data);
+        void GetClassObject(
+                [in] GUID clsid,
+                [in] uint32 context,
+                [in] uint32 locale,
+                [in] GUID iid,
+                [out, iid_is(iid)] MInterfacePointer *data
+                );
 }
 
@@ -134 +142 @@
         pointer_default(unique),
         uuid("c6f3ee72-ce7e-11d1-b71e-00c04fc3111a")
-] interface IMachineLocalActivator 
+] interface IMachineLocalActivator
 {
         WERROR IMachineLocalActivator_foo();
@@ -147 +155 @@
 }
 
-/* Looks like this is the equivalent of .NET's 
+/* Looks like this is the equivalent of .NET's
    System.Activator class */
 [
@@ -155 +163 @@
         interface ISystemActivator : IClassActivator
 {
-        WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1,  /* OXID ? */
-                                                                                          [in] MInterfacePointer iface1,
-                                                                                          [in] hyper unknown2,
-                                                                                          [out] uint32 *unknown3, 
-                                                                                          [out] MInterfacePointer *iface2);
+        WERROR ISystemActivatorRemoteCreateInstance(
+                [in] hyper unknown1,  /* OXID ? */
+                [in] MInterfacePointer iface1,
+                [in] hyper unknown2,
+                [out] uint32 *unknown3,
+                [out] MInterfacePointer *iface2
+                );
 }
 
@@ -176 +186 @@
 {
         [call_as(QueryInterface2)] WERROR RemQueryInterface2 (
-                 [in, unique] GUID *ripid,
-                 [in] uint16 cIids,
-                 [in, size_is(cIids), unique] GUID *iids,
-                 [out, size_is(cIids), unique] WERROR *phr,
-                 [out, size_is(cIids), unique] MInterfacePointer *ppMIF
+                [in, unique] GUID *ripid,
+                [in] uint16 cIids,
+                [in, size_is(cIids), unique] GUID *iids,
+                [out, size_is(cIids), unique] WERROR *phr,
+                [out, size_is(cIids), unique] MInterfacePointer *ppMIF
                 );
 }
@@ -193 +203 @@
         /* Function 0x03 */
         WERROR GetTypeInfoCount(
-                        [out, unique] uint16 *pctinfo);
+                [out, unique] uint16 *pctinfo
+                );
 
         typedef struct {
@@ -201 +212 @@
         /* Function 0x04 */
         WERROR GetTypeInfo (
-                        [in] uint16 iTInfo,
-                        [in] uint32 lcid,
-                        [out, unique] REF_ITypeInfo *ppTInfo);
+                [in] uint16 iTInfo,
+                [in] uint32 lcid,
+                [out, unique] REF_ITypeInfo *ppTInfo
+                );
 
         /*****************/
         /* Function 0x05 */
         WERROR GetIDsOfNames(
-                        [in, unique] GUID *riid,
-                        /*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */
-                        [in] uint16 cNames,
-                        [in] uint32 lcid,
-                        [out,size_is(cNames), unique] uint32 *rgDispId);
+                [in, unique] GUID *riid,
+                /*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */
+                [in] uint16 cNames,
+                [in] uint32 lcid,
+                [out,size_is(cNames), unique] uint32 *rgDispId
+                );
 
         typedef struct {
@@ -231 +244 @@
         /* Function 0x06 */
         WERROR Invoke(
-                        [in] uint32 dispIdMember,
-                        [in, unique] GUID *riid,
-                        [in] uint32 lcid,
-                        [in] uint16 wFlags,
-                        [out,in, unique] DISPPARAMS *pDispParams,
-                        [out, unique] VARIANT *pVarResult,
-                        [out, unique] EXCEPINFO *pExcepInfo,
-                        [out, unique] uint16 *puArgErr);
+                [in] uint32 dispIdMember,
+                [in, unique] GUID *riid,
+                [in] uint32 lcid,
+                [in] uint16 wFlags,
+                [out,in, unique] DISPPARAMS *pDispParams,
+                [out, unique] VARIANT *pVarResult,
+                [out, unique] EXCEPINFO *pExcepInfo,
+                [out, unique] uint16 *puArgErr
+                );
 }
 
@@ -252 +266 @@
 
 [
-        uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78),
+        uuid("DA23F6DB-6F45-466C-9EED-0B65286F2D78"),
         helpstring("ICoffeeMachine Interface"),
         pointer_default(unique),
@@ -277 +291 @@
 {
         WERROR Read(
-                                [out, size_is(num_requested), length_is(*num_read)] uint8 pv[],
-                                [in] uint32 num_requested, 
-                                [in, unique] uint32 *num_readx,
-                                [out] uint32 *num_read
-                                );
+                [out, size_is(num_requested), length_is(*num_read)] uint8 pv[],
+                [in] uint32 num_requested,
+                [in, unique] uint32 *num_readx,
+                [out] uint32 *num_read
+                );
 
         WERROR Write(
-                                [in,size_is(num_requested),unique] uint8 *data,
-                                 [in] uint32 num_requested,
-                                 [out] uint32 *num_written);
+                [in,size_is(num_requested),unique] uint8 *data,
+                [in] uint32 num_requested,
+                [out] uint32 *num_written
+                 );
 }
 
@@ -294 +309 @@
         helpstring("simple class"),
         internal
-] coclass simple 
+] coclass simple
 {
         interface IStream;

vendor/current/librpc/idl/dfsblobs.idl

@@ -54 +54 @@
                 [relative_short] nstring *DFS_alt_path;
                 [relative_short] nstring *netw_address;
-                /* As stated in MS DFSC 2.2.4.3.1 this array was guid but now MUST be 16 null bytes*/
         } dfs_normal_referral;
 
@@ -75 +74 @@
 
         typedef [flag(NDR_NOALIGN)] struct {
+                uint16 size;
                 DFS_SERVER_TYPE server_type;
                 DFS_FLAGS_REFERRAL entry_flags;
                 uint32 ttl;
                 [switch_is(entry_flags & DFS_FLAG_REFERRAL_DOMAIN_RESP)] dfs_referral referrals;
-        } dfs_referral_v3_remaining;
-
-        typedef [flag(NDR_NOALIGN)] struct {
-                uint16 size;
-                dfs_referral_v3_remaining data;
                 /* this is either 0 or 16 bytes */
                 [switch_is(size - 18)] dfs_padding service_site_guid;
         } dfs_referral_v3;
-
-        typedef struct {
-                uint16 size;
-                DFS_SERVER_TYPE server_type;
-                DFS_FLAGS_REFERRAL entry_flags;
-                uint32 ttl;
-                dfs_normal_referral r1;
-        } dfs_referral_v4;
 
         typedef [nodiscriminant] union {
@@ -100 +87 @@
                 [case(2)] dfs_referral_v2 v2;
                 [case(3)] dfs_referral_v3 v3;
-                [case(4)] dfs_referral_v4 v4;
+                [case(4)] dfs_referral_v3 v4;
                 [default];
         } dfs_referral_version;

vendor/current/librpc/idl/dns.idl

@@ -9 +9 @@
 */
 
-import "misc.idl";
+import "misc.idl", "dnsp.idl";
 [
         helper("librpc/ndr/ndr_dns.h"),
@@ -37 +37 @@
                 DNS_OPCODE_IQUERY         =  (0x1<<11),
                 DNS_OPCODE_STATUS         =  (0x2<<11),
-                DNS_OPCODE_REGISTER       =  (0x5<<11),
+                DNS_OPCODE_UPDATE         =  (0x5<<11),
                 DNS_OPCODE_RELEASE        =  (0x6<<11),
                 DNS_OPCODE_WACK           =  (0x7<<11),
@@ -47 +47 @@
         /* rcode values */
         typedef [public] enum {
-                DNS_RCODE_OK       = 0x0,
-                DNS_RCODE_FORMERR  = 0x1,
-                DNS_RCODE_SERVFAIL = 0x2,
-                DNS_RCODE_NXDOMAIN = 0x3,
-                DNS_RCODE_NOTIMP   = 0x4,
-                DNS_RCODE_REFUSED  = 0x5,
-                DNS_RCODE_YXDOMAIN = 0x6,
-                DNS_RCODE_YXRRSET  = 0x7,
-                DNS_RCODE_NXRRSET  = 0x8,
-                DNS_RCODE_NOTAUTH  = 0x9,
-                DNS_RCODE_NOTZONE  = 0xA
+                DNS_RCODE_OK       = 0x00,
+                DNS_RCODE_FORMERR  = 0x01,
+                DNS_RCODE_SERVFAIL = 0x02,
+                DNS_RCODE_NXDOMAIN = 0x03,
+                DNS_RCODE_NOTIMP   = 0x04,
+                DNS_RCODE_REFUSED  = 0x05,
+                DNS_RCODE_YXDOMAIN = 0x06,
+                DNS_RCODE_YXRRSET  = 0x07,
+                DNS_RCODE_NXRRSET  = 0x08,
+                DNS_RCODE_NOTAUTH  = 0x09,
+                DNS_RCODE_NOTZONE  = 0x0A,
+                DNS_RCODE_BADSIG   = 0x10,
+                DNS_RCODE_BADKEY   = 0x11,
+                DNS_RCODE_BADTIME  = 0x12,
+                DNS_RCODE_BADMODE  = 0x13,
+                DNS_RCODE_BADNAME  = 0x14,
+                DNS_RCODE_BADALG   = 0x15
         } dns_rcode;
 
         typedef [public,enum16bit] enum {
-                DNS_QCLASS_IP   = 0x0001,
+                DNS_QCLASS_IN   = 0x0001,
                 DNS_QCLASS_NONE = 0x00FE,
                 DNS_QCLASS_ANY  = 0x00FF
@@ -101 +107 @@
                 DNS_QTYPE_NAPTR  = 0x0023,
                 DNS_QTYPE_DNAME  = 0x0027,
+                DNS_QTYPE_OPT    = 0x0029,
                 DNS_QTYPE_DS     = 0x002B,
                 DNS_QTYPE_RRSIG  = 0x002E,
@@ -106 +113 @@
                 DNS_QTYPE_DNSKEY = 0x0030,
                 DNS_QTYPE_DHCID  = 0x0031,
-                DNS_QTYPE_ALL    = 0x00FF,
-                DNS_QTYPE_WINS   = 0xFF01,
-                DNS_QTYPE_WINSR  = 0xFF02
+                DNS_QTYPE_TKEY   = 0x00F9,
+                DNS_QTYPE_TSIG   = 0x00FA,
+                DNS_QTYPE_AXFR   = 0x00FC,
+                DNS_QTYPE_MAILB  = 0x00FD,
+                DNS_QTYPE_MAILA  = 0x00FE,
+                DNS_QTYPE_ALL    = 0x00FF
         } dns_qtype;
+
+        typedef [public,enum16bit] enum {
+                DNS_TKEY_MODE_NULL   = 0x0000,
+                DNS_TKEY_MODE_SERVER = 0x0001,
+                DNS_TKEY_MODE_DH     = 0x0002,
+                DNS_TKEY_MODE_GSSAPI = 0x0003,
+                DNS_TKEY_MODE_CLIENT = 0x0004,
+                DNS_TKEY_MODE_DELETE = 0x0005,
+                DNS_TKEY_MODE_LAST   = 0xFFFF
+        } dns_tkey_mode;
 
         typedef [public] struct {
@@ -133 +153 @@
 
         typedef [public] struct {
+                uint16     preference;
+                dns_string exchange;
+        } dns_mx_record;
+
+        typedef [public,nopull] struct {
+                dnsp_string_list txt;
+        } dns_txt_record;
+
+        typedef [public] struct {
+                dns_string mbox;
+                dns_string txt;
+
+        } dns_rp_record;
+
+        typedef [public] struct {
                 uint16     priority;
                 uint16     weight;
@@ -140 +175 @@
 
         typedef [public] struct {
-                uint16     preference;
-                dns_string exchange;
-        } dns_mx_record;
+                uint16     option_code;
+                uint16     option_length;
+                uint8      option_data[option_length];
+        } dns_opt_record;
+
+        typedef [public] struct {
+                dns_string     algorithm;
+                uint32         inception;
+                uint32         expiration;
+                dns_tkey_mode  mode;
+                uint16         error;
+                uint16         key_size;
+                uint8          key_data[key_size];
+                uint16         other_size;
+                uint8          other_data[other_size];
+        } dns_tkey_record;
+
+        typedef [public] struct {
+                dns_string algorithm_name;
+                uint16     time_prefix; /* 0 until February 2106*/
+                uint32     time;
+                uint16     fudge;
+                uint16     mac_size;
+                uint8      mac[mac_size];
+                uint16     original_id;
+                uint16     error;
+                uint16     other_size;
+                uint8      other_data[other_size];
+        } dns_tsig_record;
+
+        typedef [flag(NDR_NOALIGN|NDR_BIG_ENDIAN|NDR_PAHEX),public] struct {
+                dns_string      name;
+                dns_qclass      rr_class;
+                uint32          ttl;
+                dns_string      algorithm_name;
+                uint16          time_prefix; /* 0 until February 2106*/
+                uint32          time;
+                uint16          fudge;
+                uint16          original_id;
+                uint16          error;
+                uint16          other_size;
+                uint8           other_data[other_size];
+        } dns_fake_tsig_rec;
 
         typedef [nodiscriminant,public,flag(NDR_NOALIGN)] union {
@@ -150 +225 @@
                 [case(DNS_QTYPE_SOA)]   dns_soa_record   soa_record;
                 [case(DNS_QTYPE_PTR)]   dns_string       ptr_record;
+                [case(DNS_QTYPE_HINFO)] dnsp_hinfo       hinfo_record;
                 [case(DNS_QTYPE_MX)]    dns_mx_record    mx_record;
+                [case(DNS_QTYPE_TXT)]   dns_txt_record   txt_record;
+                [case(DNS_QTYPE_RP)]    dns_rp_record    rp_record;
                 [case(DNS_QTYPE_AAAA)]  ipv6address      ipv6_record;
                 [case(DNS_QTYPE_SRV)]   dns_srv_record   srv_record;
+                [case(DNS_QTYPE_OPT)]   dns_opt_record   opt_record;
+                [case(DNS_QTYPE_TSIG)]  dns_tsig_record  tsig_record;
+                [case(DNS_QTYPE_TKEY)]  dns_tkey_record  tkey_record;
                 [default];
         } dns_rdata;
@@ -182 +263 @@
            this is a convenience hook for ndrdump
         */
-        void decode_dns_name_packet(
+        [nopython] void decode_dns_name_packet(
                                     [in] dns_name_packet packet
                                    );

vendor/current/librpc/idl/dnsp.idl

@@ -24 +24 @@
 interface dnsp
 {
-        typedef [enum16bit] enum {
+        typedef [enum16bit,public] enum {
                 DNS_TYPE_TOMBSTONE  = 0x0,
                 DNS_TYPE_A     = 0x1,
@@ -66 +66 @@
         } dns_record_type;
 
+        typedef [bitmap32bit] bitmap {
+                DNS_RPC_FLAG_SUPPRESS_NOTIFY    = 0x00010000,
+                DNS_RPC_FLAG_AGING_ON                   = 0x00020000,
+                DNS_RPC_FLAG_OPEN_ACL                   = 0x00040000,
+                DNS_RPC_FLAG_NODE_COMPLETE              = 0x00800000,
+                DNS_RPC_FLAG_NODE_STICKY                = 0x01000000,
+                DNS_RPC_FLAG_RECORD_CREATE_PTR  = 0x02000000,
+                DNS_RPC_FLAG_RECORD_TTL_CHANGE  = 0x04000000,
+                DNS_RPC_FLAG_RECORD_DEFAULT_TTL = 0x08000000,
+                DNS_RPC_FLAG_ZONE_DELEGATION    = 0x10000000,
+                DNS_RPC_FLAG_AUTH_ZONE_ROOT             = 0x20000000,
+                DNS_RPC_FLAG_ZONE_ROOT                  = 0x40000000,
+                DNS_RPC_FLAG_CACHE_DATA                 = 0x80000000
+        }
+        dns_rpc_node_flags;
+
+
         typedef [enum8bit] enum {
                 DNS_RANK_NONE                   = 0x00,
@@ -82 +99 @@
         } dns_record_rank;
 
+        typedef [v1_enum] enum {
+                DNS_ZONE_TYPE_CACHE             = 0x00,
+                DNS_ZONE_TYPE_PRIMARY           = 0x01,
+                DNS_ZONE_TYPE_SECONDARY         = 0x02,
+                DNS_ZONE_TYPE_STUB              = 0x03,
+                DNS_ZONE_TYPE_FORWARDER         = 0x04,
+                DNS_ZONE_TYPE_SECONDARY_CACHE   = 0x05
+        } dns_zone_type;
+
+        typedef [public,enum8bit] enum {
+                DNS_ZONE_UPDATE_OFF         = 0x00,
+                DNS_ZONE_UPDATE_UNSECURE    = 0x01,
+                DNS_ZONE_UPDATE_SECURE      = 0x02
+        } dns_zone_update;
+
+        typedef [v1_enum] enum {
+                DSPROPERTY_ZONE_EMPTY                   = 0x00,
+                DSPROPERTY_ZONE_TYPE                    = 0x01,
+                DSPROPERTY_ZONE_ALLOW_UPDATE            = 0x02,
+                DSPROPERTY_ZONE_SECURE_TIME             = 0x08,
+                DSPROPERTY_ZONE_NOREFRESH_INTERVAL      = 0x10,
+                DSPROPERTY_ZONE_SCAVENGING_SERVERS      = 0x11,
+                DSPROPERTY_ZONE_AGING_ENABLED_TIME      = 0x12,
+                DSPROPERTY_ZONE_REFRESH_INTERVAL        = 0x20,
+                DSPROPERTY_ZONE_AGING_STATE             = 0x40,
+                DSPROPERTY_ZONE_DELETED_FROM_HOSTNAME   = 0x80,
+                DSPROPERTY_ZONE_MASTER_SERVERS          = 0x81,
+                DSPROPERTY_ZONE_AUTO_NS_SERVERS         = 0x82,
+                DSPROPERTY_ZONE_DCPROMO_CONVERT         = 0x83,
+                DSPROPERTY_ZONE_SCAVENGING_SERVERS_DA   = 0x90,
+                DSPROPERTY_ZONE_MASTER_SERVERS_DA       = 0x91,
+                DSPROPERTY_ZONE_NS_SERVERS_DA           = 0x92,
+                DSPROPERTY_ZONE_NODE_DBFLAGS                    = 0x100
+
+        } dns_property_id;
+
+        typedef [enum8bit] enum {
+                DCPROMO_CONVERT_NONE    = 0x00,
+                DCPROMO_CONVERT_DOMAIN  = 0x01,
+                DCPROMO_CONVERT_FOREST  = 0x02
+        } dns_dcpromo_flag;
+
         typedef [public] struct {
                 uint32          serial;
@@ -109 +168 @@
         } dnsp_srv;
 
+        typedef struct {
+                uint32  addrCount;
+                [size_is(addrCount)] uint32 *addr;
+        } dnsp_ip4_array;
+
+        typedef struct {
+                uint16  family;
+                uint16  port;
+                ipv4address ipv4;
+                ipv6address ipv6;
+                uint8   pad[8];
+                uint32  unused[8];
+        } dnsp_dns_addr;
+
+        typedef [public] struct {
+                uint32  MaxCount;
+                uint32  AddrCount;
+                uint32  Tag;
+                uint16  Family;
+                uint16  Reserved0;
+                uint32  MatchFlag;
+                uint32  Reserved1;
+                uint32  Reserved2;
+                dnsp_dns_addr AddrArray[AddrCount];
+        } dnsp_dns_addr_array;
+
+        typedef [public,nopull,nopush,noprint,gensize] struct {
+                uint8           count;
+                dnsp_string     str[count];
+        } dnsp_string_list;
+
         typedef [nodiscriminant,gensize] union {
                 [case(DNS_TYPE_TOMBSTONE)]                  NTTIME timestamp;
@@ -116 +206 @@
                 [case(DNS_TYPE_SOA)] [flag(NDR_BIG_ENDIAN)] dnsp_soa soa;
                 [case(DNS_TYPE_MX)] [flag(NDR_BIG_ENDIAN)]  dnsp_mx mx;
-                [case(DNS_TYPE_TXT)]                        dnsp_string txt;
+                [case(DNS_TYPE_TXT)]                        dnsp_string_list txt;
                 [case(DNS_TYPE_PTR)]                        dnsp_name ptr;
                 [case(DNS_TYPE_HINFO)]                      dnsp_hinfo hinfo;
@@ -133 +223 @@
                 uint16                  flags;
                 uint32                  dwSerial;
-                [flag(NDR_BIG_ENDIAN)]  uint32   dwTtlSeconds;
+                [flag(NDR_BIG_ENDIAN)]  uint32   dwTtlSeconds;
                 uint32                  dwReserved;
                 uint32                  dwTimeStamp;
@@ -139 +229 @@
         } dnsp_DnssrvRpcRecord;
 
+        typedef [nodiscriminant,gensize] union {
+                [case(DSPROPERTY_ZONE_EMPTY)]                                   ;
+                [case(DSPROPERTY_ZONE_TYPE)]                    dns_zone_type zone_type;
+                [case(DSPROPERTY_ZONE_ALLOW_UPDATE)]            dns_zone_update allow_update_flag;
+                [case(DSPROPERTY_ZONE_SECURE_TIME)]             NTTIME zone_secure_time;
+                [case(DSPROPERTY_ZONE_NOREFRESH_INTERVAL)]      uint32 norefresh_hours;
+                [case(DSPROPERTY_ZONE_REFRESH_INTERVAL)]        uint32 refresh_hours;
+                [case(DSPROPERTY_ZONE_AGING_STATE)]             uint32 aging_enabled;
+                [case(DSPROPERTY_ZONE_SCAVENGING_SERVERS)]      dnsp_ip4_array servers;
+                [case(DSPROPERTY_ZONE_AGING_ENABLED_TIME)]      uint32 next_scavenging_cycle_hours;
+                [case(DSPROPERTY_ZONE_DELETED_FROM_HOSTNAME)]   utf8string deleted_by_hostname;
+                [case(DSPROPERTY_ZONE_MASTER_SERVERS)]          dnsp_ip4_array master_servers;
+                [case(DSPROPERTY_ZONE_AUTO_NS_SERVERS)]         dnsp_ip4_array ns_servers;
+                [case(DSPROPERTY_ZONE_DCPROMO_CONVERT)]         dns_dcpromo_flag dcpromo_flag;
+                [case(DSPROPERTY_ZONE_SCAVENGING_SERVERS_DA)]   dnsp_dns_addr_array s_ns_servers;
+                [case(DSPROPERTY_ZONE_MASTER_SERVERS_DA)]               dnsp_dns_addr_array z_master_servers;
+                [case(DSPROPERTY_ZONE_NS_SERVERS_DA)]                   dnsp_dns_addr_array d_ns_servers;
+                [case(DSPROPERTY_ZONE_NODE_DBFLAGS)]                    dns_rpc_node_flags flags;
+        } dnsPropertyData;
+
+        /* this is the format for the dnsProperty attribute in the DNS
+           partitions in AD */
+        typedef [flag(NDR_NOALIGN),public] struct {
+                [value(ndr_size_dnsPropertyData(&data,id,ndr->flags))] uint32 wDataLength;
+                uint32                          namelength;
+                [value(0)] uint32   flag;
+                [value(1)] uint32   version;
+                dns_property_id     id;
+                [switch_is(wDataLength?id:DSPROPERTY_ZONE_EMPTY)]     dnsPropertyData data;
+                uint32              name;
+        } dnsp_DnsProperty;
 
         /*
-          this is a convenience hook for ndrdump
+          these are convenience hooks for ndrdump
          */
-        void decode_DnssrvRpcRecord(
+        [nopython] void decode_DnssrvRpcRecord(
                 [in] dnsp_DnssrvRpcRecord blob
                 );
+
+        [nopython] void decode_DnsProperty(
+                [in] dnsp_DnsProperty blob
+                );
 }

vendor/current/librpc/idl/dnsserver.idl

@@ +1 @@
+#include "idl_types.h"
 /*
   dnsserver interface definition
+  for a protocol descrition see [MS-DNSP].pdf
 */
+
+import "misc.idl", "dnsp.idl";
 
 [ uuid("50abc2a4-574d-40b3-9d66-ee4fd5fba076"),
   version(5.0),
   pointer_default(unique),
-  helpstring("DNS Server")
+  endpoint("ncacn_ip_tcp:", "ncacn_np:[\\pipe\\dnsserver]"),
+  helper("../librpc/ndr/ndr_dnsserver.h"),
+  helpstring("DNS Management Server")
 ] interface dnsserver
 {
-        void dnsserver_foo();
+
+#define wchar_t uint16
+#define BOOLEAN boolean8
+#define BOOL boolean32
+#define BYTE uint8
+#define UCHAR uint8
+#define CHAR char
+#define PBYTE BYTE*
+#define DWORD uint32
+#define PDWORD uint32 *
+
+        /* */
+        /*   DNS RPC data types */
+        /* */
+
+        typedef [v1_enum] enum {
+                DNS_RPC_USE_TCPIP                       = 0x00000001,
+                DNS_RPC_USE_NAMED_PIPE          = 0x00000002,
+                DNS_RPC_USE_LPC                         = 0x00000004,
+                DNS_RPC_USE_ALL_PROTOCOLS       = 0xFFFFFFFF
+        }
+        DNS_RPC_PROTOCOLS;
+
+        typedef [v1_enum] enum {
+                DNS_CLIENT_VERSION_W2K          = 0x00000000,
+                DNS_CLIENT_VERSION_DOTNET       = 0x00060000,
+                DNS_CLIENT_VERSION_LONGHORN = 0x00070000
+        }
+        DNS_RPC_CLIENT_VERSION;
+
+        /* Return buffer */
+        typedef struct {
+                DWORD                       dwLength;
+                [size_is(dwLength)] BYTE    Buffer[];
+        } DNS_RPC_BUFFER;
+
+        /* String Array */
+        typedef struct {
+                [range(0,10000)]        DWORD       dwCount;
+                [size_is(dwCount),string,charset(UTF8)]      char *       pszStrings[];
+        } DNS_RPC_UTF8_STRING_LIST;
+
+        /* Name and parameter value */
+        typedef struct {
+                DWORD       dwParam;
+                [string, charset(UTF8)] char *       pszNodeName;
+        }
+        DNS_RPC_NAME_AND_PARAM;
+
+
+        /* */
+        /*   DNS Resource Record data types */
+        /* */
+
+        /* DNS_RECORD_TYPE is defined in dnsp.idl as dns_record_type */
+        /* DNS_RPC_NODE_FLAGS is defined in dnsp.idl as dns_rpc_node_flags */
+
+        typedef [public,gensize] struct {
+                [value(strlen(str))] uint8 len;
+                [charset(UNIX)] uint8 str[len];
+        }
+        DNS_RPC_NAME;
+
+        typedef struct {
+                uint16 wLength;
+                uint16 wRecordCount;
+                uint32 dwFlags;
+                uint32 dwChildCount;
+                DNS_RPC_NAME dnsNodeName;
+        }
+        DNS_RPC_NODE;
+
+        typedef struct {
+                uint32 dwSerialNo;
+                uint32 dwRefresh;
+                uint32 dwRetry;
+                uint32 dwExpire;
+                uint32 dwMinimumTtl;
+                DNS_RPC_NAME NamePrimaryServer;
+                DNS_RPC_NAME ZoneAdministratorEmail;
+        }
+        DNS_RPC_RECORD_SOA;
+
+        typedef struct {
+                uint16 wPreference;
+                DNS_RPC_NAME nameExchange;
+        }
+        DNS_RPC_RECORD_NAME_PREFERENCE;
+
+        typedef [nopull,nopush] struct {
+                uint8 count;
+                DNS_RPC_NAME str[count];
+        }
+        DNS_RPC_RECORD_STRING;
+
+        typedef struct {
+                uint16 wPriority;
+                uint16 wWeight;
+                uint16 wPort;
+                DNS_RPC_NAME nameTarget;
+        }
+        DNS_RPC_RECORD_SRV;
+
+        typedef [nodiscriminant,gensize,flag(NDR_NOALIGN)] union {
+                [case(DNS_TYPE_TOMBSTONE)]                  NTTIME timestamp;
+                [case(DNS_TYPE_A)] [flag(NDR_BIG_ENDIAN)]   ipv4address ipv4;
+                [case(DNS_TYPE_NS)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_MD)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_MF)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_CNAME)]                          DNS_RPC_NAME name;
+                [case(DNS_TYPE_SOA)]                            DNS_RPC_RECORD_SOA soa;
+                [case(DNS_TYPE_MB)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_MG)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_MR)]                             DNS_RPC_NAME name;
+                [case(DNS_TYPE_PTR)]                            DNS_RPC_NAME ptr;
+                [case(DNS_TYPE_HINFO)]                          DNS_RPC_NAME hinfo;
+                [case(DNS_TYPE_MX)]                             DNS_RPC_RECORD_NAME_PREFERENCE mx;
+                [case(DNS_TYPE_TXT)]                            DNS_RPC_RECORD_STRING txt;
+                [case(DNS_TYPE_AAAA)]                           ipv6address ipv6;
+                [case(DNS_TYPE_SRV)]                            DNS_RPC_RECORD_SRV srv;
+                [case(DNS_TYPE_DNAME)]                          DNS_RPC_NAME name;
+        }
+        DNS_RPC_DATA;
+
+        typedef [public] struct {
+                [value(ndr_size_DNS_RPC_DATA(&data,wType,0))] uint16 wDataLength;
+                dns_record_type        wType;
+                DWORD       dwFlags;
+                DWORD       dwSerial;
+                DWORD       dwTtlSeconds;
+                DWORD       dwTimeStamp;
+                DWORD       dwReserved;
+                [subcontext(0),subcontext_size(wDataLength),switch_is(wType)] DNS_RPC_DATA data;
+        }
+        DNS_RPC_RECORD;
+
+        typedef struct {
+                [value(ndr_size_DNS_RPC_DATA(&rec.data,rec.wType,0))] uint3264 wContextLength;
+                DNS_RPC_RECORD rec;
+        }
+        DNS_RPC_RECORD_BUF;
+
+
+        /* */
+        /*   DNS Address Information data types */
+        /* */
+
+        typedef [v1_enum] enum {
+                DNS_IPVAL_DNS_SERVERS           = 0x00,
+                DNS_IPVAL_DNS_ROOTHINTS         = 0x01,
+                DNS_IPVAL_DNS_FORWARDERS        = 0x02,
+                DNS_IPVAL_DNS_ZONE_MASTERS      = 0x03,
+                DNS_IPVAL_DNS_DELEGATIONS       = 0x04
+        }
+        DNS_IPVAL_CONTEXT;
+
+        typedef [v1_enum] enum {
+                ERROR_SUCCESS                           = 0x00,
+                DNS_IPVAL_INVALID_ADDR          = 0x01,
+                DNS_IPVAL_UNREACHABLE           = 0x02,
+                DNS_IPVAL_NO_RESPONSE           = 0x03,
+                DNS_IPVAL_NOT_AUTH_FOR_ZONE     = 0x04,
+                DNS_IPVAL_UNKNOWN_ERROR         = 0xFF,
+                DNS_IPVAL_NO_TCP                        = 0x80000000
+        }
+        DNS_IP_VALIDATE_RETURN_FLAGS;
+
+        typedef struct {
+                DWORD           AddrCount;
+                [size_is( AddrCount )] DWORD        AddrArray[];
+        } IP4_ARRAY;
+#define PIP4_ARRAY IP4_ARRAY*
+
+        typedef struct {
+                CHAR MaxSa[32];
+                DWORD DnsAddrUserDword[8];
+        } DNS_ADDR;
+
+        typedef struct {
+                DWORD           MaxCount;
+                DWORD           AddrCount;
+                DWORD           Tag;
+                WORD            Family;
+                WORD            WordReserved;
+                DWORD           Flags;
+                DWORD           MatchFlag;
+                DWORD           Reserved1;
+                DWORD           Reserved2;
+                [size_is( AddrCount )] DNS_ADDR         AddrArray[];
+        } DNS_ADDR_ARRAY;
+#define PDNS_ADDR_ARRAY DNS_ADDR_ARRAY*
+
+        typedef struct {
+                DWORD               dwRpcStructureVersion;
+                DWORD               dwReserved0;
+                DWORD               dwContext;
+                DWORD               dwReserved1;
+                [string, charset(UTF8)] char *                 pszContextName;
+                PDNS_ADDR_ARRAY     aipValidateAddrs;
+        }
+        DNS_RPC_IP_VALIDATE;
+
+
+        /* */
+        /*   DNS Server data types */
+        /* */
+
+        typedef [enum8bit] enum {
+                DNS_BOOT_METHOD_UNINITIALIZED   = 0x00,
+                DNS_BOOT_METHOD_FILE                    = 0x01,
+                DNS_BOOT_METHOD_REGISTRY                = 0x02,
+                DNS_BOOT_METHOD_DIRECTORY               = 0x03
+        }
+        DNS_BOOT_METHOD;
+
+        typedef [v1_enum] enum {
+                DNS_ALLOW_RFC_NAMES_ONLY                = 0x00,
+                DNS_ALLOW_NONRFC_NAMES                  = 0x01,
+                DNS_ALLOW_MULTIBYTE_NAMES               = 0x02,
+                DNS_ALLOW_ALL_NAMES                             = 0x03
+        }
+        DNS_NAME_CHECK_FLAG;
+
+        typedef struct {
+                /* version */
+                /* basic configuration flags */
+
+                DWORD          dwVersion;
+                DNS_BOOT_METHOD fBootMethod;
+                BOOLEAN        fAdminConfigured;
+                BOOLEAN        fAllowUpdate;
+                BOOLEAN        fDsAvailable;
+
+                /* pointer section */
+
+                [string, charset(UTF8)] char *           pszServerName;
+
+                /* DS container */
+
+                [string, charset(UTF16)] wchar_t *        pszDsContainer;
+
+                /* IP interfaces */
+
+                PIP4_ARRAY     aipServerAddrs;
+                PIP4_ARRAY     aipListenAddrs;
+
+                /* forwarders */
+
+                PIP4_ARRAY     aipForwarders;
+
+                /* future extensions */
+
+                PDWORD         pExtension1;
+                PDWORD         pExtension2;
+                PDWORD         pExtension3;
+                PDWORD         pExtension4;
+                PDWORD         pExtension5;
+
+                /* DWORD section */
+
+                /* logging */
+
+                DWORD          dwLogLevel;
+                DWORD          dwDebugLevel;
+
+                /* configuration DWORDs */
+
+                DWORD         dwForwardTimeout;
+                DWORD         dwRpcProtocol;
+                DNS_NAME_CHECK_FLAG         dwNameCheckFlag;
+                DWORD         cAddressAnswerLimit;
+                DWORD         dwRecursionRetry;
+                DWORD         dwRecursionTimeout;
+                DWORD         dwMaxCacheTtl;
+                DWORD         dwDsPollingInterval;
+
+                /* aging / scavenging */
+
+                DWORD         dwScavengingInterval;
+                DWORD         dwDefaultRefreshInterval;
+                DWORD         dwDefaultNoRefreshInterval;
+
+                DWORD         dwReserveArray[10];
+
+                /* BYTE section */
+
+                /* configuration flags */
+
+                BOOLEAN       fAutoReverseZones;
+                BOOLEAN       fAutoCacheUpdate;
+
+                /* recursion control */
+
+                BOOLEAN       fRecurseAfterForwarding;
+                BOOLEAN       fForwardDelegations;
+                BOOLEAN       fNoRecursion;
+                BOOLEAN       fSecureResponses;
+
+                /* lookup control */
+
+                BOOLEAN       fRoundRobin;
+                BOOLEAN       fLocalNetPriority;
+
+                /* BIND compatibility and mimicking */
+
+                BOOLEAN       fBindSecondaries;
+                BOOLEAN       fWriteAuthorityNs;
+
+                /* Bells and whistles */
+
+                BOOLEAN       fStrictFileParsing;
+                BOOLEAN       fLooseWildcarding;
+
+                /*   aging / scavenging */
+
+                BOOLEAN       fDefaultAgingState;
+                BOOLEAN       fReserveArray[15];
+        }
+        DNS_RPC_SERVER_INFO_W2K;
+
+        typedef struct {
+                [string, charset(UTF8)] uint8 *extension;
+        } DNS_EXTENSION;
+
+        typedef [public] struct {
+                DWORD          dwRpcStructureVersion;
+                DWORD          dwReserved0;
+
+                /* basic configuration flags */
+
+                DWORD          dwVersion;
+                DNS_BOOT_METHOD fBootMethod;
+                BOOLEAN        fAdminConfigured;
+                BOOLEAN        fAllowUpdate;
+                BOOLEAN        fDsAvailable;
+
+                /* pointer section */
+
+                [string, charset(UTF8)] char *        pszServerName;
+
+                /* DS container */
+
+                [string, charset(UTF16)] wchar_t *     pszDsContainer;
+
+                /* IP interfaces */
+
+                PIP4_ARRAY     aipServerAddrs;
+                PIP4_ARRAY     aipListenAddrs;
+
+                /* forwarders */
+
+                PIP4_ARRAY     aipForwarders;
+
+                /* logging */
+
+                PIP4_ARRAY aipLogFilter;
+                [string, charset(UTF16)] wchar_t *  pwszLogFilePath;
+
+                /* Server domain/forest */
+
+                [string, charset(UTF8)] char *            pszDomainName;         /*   UTF-8 FQDN */
+                [string, charset(UTF8)] char *            pszForestName;         /*   UTF-8 FQDN */
+
+                /* Built-in directory partitions */
+
+                [string, charset(UTF8)] char *            pszDomainDirectoryPartition;    /*   UTF-8 FQDN */
+                [string, charset(UTF8)] char *            pszForestDirectoryPartition;    /*   UTF-8 FQDN */
+
+                /* future extensions */
+                DNS_EXTENSION       pExtensions[6];
+
+                /* DWORD section */
+
+                /* logging */
+
+                DWORD          dwLogLevel;
+                DWORD          dwDebugLevel;
+
+                /* configuration DWORDs */
+
+                DWORD         dwForwardTimeout;
+                DWORD         dwRpcProtocol;
+                DNS_NAME_CHECK_FLAG         dwNameCheckFlag;
+                DWORD         cAddressAnswerLimit;
+                DWORD         dwRecursionRetry;
+                DWORD         dwRecursionTimeout;
+                DWORD         dwMaxCacheTtl;
+                DWORD         dwDsPollingInterval;
+                DWORD         dwLocalNetPriorityNetMask;
+
+                /* aging and scavenging */
+
+                DWORD         dwScavengingInterval;
+                DWORD         dwDefaultRefreshInterval;
+                DWORD         dwDefaultNoRefreshInterval;
+                DWORD         dwLastScavengeTime;
+
+                /* more logging */
+
+                DWORD         dwEventLogLevel;
+                DWORD         dwLogFileMaxSize;
+
+                /* Active Directory information */
+
+                DWORD         dwDsForestVersion;
+                DWORD         dwDsDomainVersion;
+                DWORD         dwDsDsaVersion;
+
+                DWORD         dwReserveArray[ 4 ];
+
+                /* BYTE section */
+
+                /* configuration flags */
+
+                BOOLEAN       fAutoReverseZones;
+                BOOLEAN       fAutoCacheUpdate;
+
+                /* recursion control */
+
+                BOOLEAN       fRecurseAfterForwarding;
+                BOOLEAN       fForwardDelegations;
+                BOOLEAN       fNoRecursion;
+                BOOLEAN       fSecureResponses;
+
+                /* lookup control */
+
+                BOOLEAN       fRoundRobin;
+                BOOLEAN       fLocalNetPriority;
+
+                /* BIND compatibility and mimicking */
+
+                BOOLEAN       fBindSecondaries;
+                BOOLEAN       fWriteAuthorityNs;
+
+                /* Bells and whistles */
+
+                BOOLEAN       fStrictFileParsing;
+                BOOLEAN        fLooseWildcarding;
+
+                /* aging \ scavenging */
+
+                BOOLEAN        fDefaultAgingState;
+
+                BOOLEAN     fReserveArray[ 15 ];
+        }
+        DNS_RPC_SERVER_INFO_DOTNET;
+
+        typedef [public] struct {
+                DWORD               dwRpcStructureVersion;
+                DWORD               dwReserved0;
+
+                /* basic configuration flags */
+
+                DWORD                  dwVersion;
+                DNS_BOOT_METHOD        fBootMethod;
+                BOOLEAN                fAdminConfigured;
+                BOOLEAN                fAllowUpdate;
+                BOOLEAN                fDsAvailable;
+
+                /* pointer section */
+
+                [string, charset(UTF8)] char *                     pszServerName;
+
+                /* DS container */
+
+                [string, charset(UTF16)] wchar_t *                  pszDsContainer;
+
+                /* IP interfaces */
+
+                PDNS_ADDR_ARRAY        aipServerAddrs;
+                PDNS_ADDR_ARRAY        aipListenAddrs;
+
+                /* forwarders */
+
+                PDNS_ADDR_ARRAY        aipForwarders;
+
+                /* logging */
+
+                PDNS_ADDR_ARRAY        aipLogFilter;
+                [string, charset(UTF16)] wchar_t *              pwszLogFilePath;
+
+                /* Server domain/forest */
+
+                [string, charset(UTF8)] char *                     pszDomainName;         /*   UTF-8 FQDN */
+                [string, charset(UTF8)] char *                     pszForestName;         /*   UTF-8 FQDN */
+
+                /* Built-in directory partitions */
+
+                [string, charset(UTF8)] char *            pszDomainDirectoryPartition;    /*   UTF-8 FQDN */
+                [string, charset(UTF8)] char *            pszForestDirectoryPartition;    /*   UTF-8 FQDN */
+
+                /* future extensions */
+                DNS_EXTENSION       pExtensions[6];
+
+                /* DWORD section */
+
+                /* logging */
+
+                DWORD          dwLogLevel;
+                DWORD          dwDebugLevel;
+
+                /* configuration DWORDs */
+
+                DWORD          dwForwardTimeout;
+                DWORD          dwRpcProtocol;
+                DNS_NAME_CHECK_FLAG          dwNameCheckFlag;
+                DWORD          cAddressAnswerLimit;
+                DWORD          dwRecursionRetry;
+                DWORD          dwRecursionTimeout;
+                DWORD          dwMaxCacheTtl;
+                DWORD          dwDsPollingInterval;
+                DWORD          dwLocalNetPriorityNetMask;
+
+                /* aging and scavenging */
+
+                DWORD          dwScavengingInterval;
+                DWORD          dwDefaultRefreshInterval;
+                DWORD          dwDefaultNoRefreshInterval;
+                DWORD          dwLastScavengeTime;
+
+                /* more logging */
+
+                DWORD          dwEventLogLevel;
+                DWORD          dwLogFileMaxSize;
+
+                /* Active Directory information */
+
+                DWORD          dwDsForestVersion;
+                DWORD          dwDsDomainVersion;
+                DWORD          dwDsDsaVersion;
+                BOOLEAN        fReadOnlyDC;
+
+                DWORD          dwReserveArray[ 3 ];
+
+                /* BYTE section */
+
+                /* configuration flags */
+
+                BOOLEAN        fAutoReverseZones;
+                BOOLEAN        fAutoCacheUpdate;
+
+                /* recursion control */
+
+                BOOLEAN        fRecurseAfterForwarding;
+                BOOLEAN        fForwardDelegations;
+                BOOLEAN        fNoRecursion;
+                BOOLEAN        fSecureResponses;
+
+                /* lookup control */
+
+                BOOLEAN      fRoundRobin;
+                BOOLEAN      fLocalNetPriority;
+
+                /* BIND compatibility and mimicking */
+
+                BOOLEAN      fBindSecondaries;
+                BOOLEAN      fWriteAuthorityNs;
+
+                /* Bells and whistles */
+
+                BOOLEAN      fStrictFileParsing;
+                BOOLEAN      fLooseWildcarding;
+
+                /* aging \ scavenging */
+
+                BOOLEAN      fDefaultAgingState;
+
+                BOOLEAN     fReserveArray[ 15 ];
+        }
+        DNS_RPC_SERVER_INFO_LONGHORN;
+#define DNS_RPC_SERVER_INFO DNS_RPC_SERVER_INFO_LONGHORN
+
+
+        /* */
+        /*   DNS Application directory partition data types */
+        /* */
+
+        typedef [bitmap32bit] bitmap {
+                DNS_DP_AUTOCREATED              = 0x00000001,
+                DNS_DP_LEGACY                   = 0x00000002,
+                DNS_DP_DOMAIN_DEFAULT   = 0x00000004,
+                DNS_DP_FOREST_DEFAULT   = 0x00000008,
+                DNS_DP_ENLISTED                 = 0x00000010,
+                DNS_DP_DELETED                  = 0x00000020
+        }
+        DNS_RPC_DP_FLAGS;
+
+        typedef struct {
+                [string, charset(UTF16)] wchar_t *      pszReplicaDn;
+        }
+        DNS_RPC_DP_REPLICA;
+#define PDNS_RPC_DP_REPLICA DNS_RPC_DP_REPLICA*
+
+        typedef [v1_enum] enum {
+                DNS_DP_OKAY                = 0x00,
+                DNS_DP_STATE_REPL_INCOMING = 0x01,
+                DNS_DP_STATE_REPL_OUTGOING = 0x02,
+                DNS_DP_STATE_UNKNOWN       = 0x03
+        } DNS_DP_STATE;
+
+        typedef struct {
+                DWORD           dwRpcStructureVersion;
+                DWORD           dwReserved0;
+
+                [string, charset(UTF8)] char *          pszDpFqdn;
+                [string, charset(UTF16)] wchar_t *       pszDpDn;
+                [string, charset(UTF16)] wchar_t *       pszCrDn;
+                DWORD           dwFlags;
+                DWORD           dwZoneCount;
+                DNS_DP_STATE    dwState;
+
+                DWORD           dwReserved[    3 ];
+                DNS_EXTENSION   pwszReserved[ 3 ];
+                [range(0,10000)]               DWORD                    dwReplicaCount;
+                [size_is(dwReplicaCount)]      PDNS_RPC_DP_REPLICA      ReplicaArray[];
+        }
+        DNS_RPC_DP_INFO;
+
+        typedef struct {
+                DWORD           dwRpcStructureVersion;
+                DWORD           dwReserved0;
+
+                [string, charset(UTF8)] char * pszDpFqdn;
+                DWORD           dwFlags;
+                DWORD           dwZoneCount;
+        }
+        DNS_RPC_DP_ENUM;
+#define PDNS_RPC_DP_ENUM DNS_RPC_DP_ENUM*
+
+        typedef struct {
+                DWORD                   dwRpcStructureVersion;
+                DWORD                   dwReserved0;
+                [range(0,5000)]         DWORD               dwDpCount;
+                [size_is(dwDpCount)]    PDNS_RPC_DP_ENUM    DpArray[];
+        }
+        DNS_RPC_DP_LIST;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+                [string, charset(UTF8)] char * pszDpFqdn;       /*      UTF8 */
+                DWORD       dwOperation;
+        }
+        DNS_RPC_ENLIST_DP;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+                [string, charset(UTF8)] char * pszDestPartition;
+        }
+        DNS_RPC_ZONE_CHANGE_DP;
+
+
+        /* */
+        /*   DNS Zone data types */
+        /* */
+
+        /* DNS_ZONE_TYPE defined in dnsp as dns_zone_type */
+
+        typedef [v1_enum] enum {
+                DNS_ZONE_SECSECURE_NO_SECURITY  = 0x00,
+                DNS_ZONE_SECSECURE_NS_ONLY              = 0x01,
+                DNS_ZONE_SECSECURE_LIST_ONLY    = 0x02,
+                DNS_ZONE_SECSECURE_NO_XFER              = 0x03
+        }
+        DNS_ZONE_SECONDARY_SECURITY;
+
+        typedef [v1_enum] enum {
+                DNS_ZONE_NOTIFY_OFF                             = 0x00,
+                DNS_ZONE_NOTIFY_ALL_SECONDARIES = 0x01,
+                DNS_ZONE_NOTIFY_LIST_ONLY               = 0x02
+        }
+        DNS_ZONE_NOTIFY_LEVEL;
+
+        typedef [v1_enum] enum {
+                DNS_ZONE_REQUEST_PRIMARY                = 0x00000001,
+                DNS_ZONE_REQUEST_SECONDARY              = 0x00000002,
+                DNS_ZONE_REQUEST_CACHE                  = 0x00000004,
+                DNS_ZONE_REQUEST_AUTO                   = 0x00000008,
+                DNS_ZONE_REQUEST_FORWARD                = 0x00000010,
+                DNS_ZONE_REQUEST_REVERSE                = 0x00000020,
+                DNS_ZONE_REQUEST_FORWARDER              = 0x00000040,
+                DNS_ZONE_REQUEST_STUB                   = 0x00000080,
+                DNS_ZONE_REQUEST_DS                             = 0x00000100,
+                DNS_ZONE_REQUEST_NON_DS                 = 0x00000200,
+                DNS_ZONE_REQUEST_DOMAIN_DP              = 0x00000400,
+                DNS_ZONE_REQUEST_FOREST_DP              = 0x00000800,
+                DNS_ZONE_REQUEST_CUSTOM_DP              = 0x00001000,
+                DNS_ZONE_REQUEST_LEGACY_DP              = 0x00002000
+        }
+        DNS_ZONE_REQUEST_FILTERS;
+
+        typedef [bitmap32bit] bitmap {
+                DNS_RPC_ZONE_PAUSED                             = 0x0001,
+                DNS_RPC_ZONE_SHUTDOWN                   = 0x0002,
+                DNS_RPC_ZONE_REVERSE                    = 0x0004,
+                DNS_RPC_ZONE_AUTOCREATED                = 0x0008,
+                DNS_RPC_ZONE_DSINTEGRATED               = 0x0010,
+                DNS_RPC_ZONE_AGING                              = 0x0020,
+                DNS_RPC_ZONE_UPDATE_UNSECURE    = 0x0040,
+                DNS_RPC_ZONE_UPDATE_SECURE              = 0x0080,
+                DNS_RPC_ZONE_READONLY                   = 0x0100
+        } DNS_RPC_ZONE_FLAGS;
+
+        typedef struct {
+                [string, charset(UTF16)] uint16 *      pszZoneName;
+                DNS_RPC_ZONE_FLAGS      Flags;
+                UCHAR                   ZoneType;
+                UCHAR                   Version;
+        }
+        DNS_RPC_ZONE_W2K;
+#define PDNS_RPC_ZONE_W2K DNS_RPC_ZONE_W2K*
+
+        typedef struct {
+                DWORD                   dwRpcStructureVersion;
+                DWORD                   dwReserved0;
+                [string, charset(UTF16)] wchar_t *      pszZoneName;
+                DNS_RPC_ZONE_FLAGS      Flags;
+                UCHAR                   ZoneType;
+                UCHAR                   Version;
+                DNS_RPC_DP_FLAGS        dwDpFlags;
+                [string, charset(UTF8)] char *         pszDpFqdn;
+        }
+        DNS_RPC_ZONE_DOTNET;
+#define DNS_RPC_ZONE DNS_RPC_ZONE_DOTNET
+#define PDNS_RPC_ZONE_DOTNET DNS_RPC_ZONE_DOTNET*
+
+        /* Zone enumeration */
+        typedef struct {
+                [range(0,500000)]       DWORD               dwZoneCount;
+                [size_is(dwZoneCount)] PDNS_RPC_ZONE_W2K    ZoneArray[];
+        }
+        DNS_RPC_ZONE_LIST_W2K;
+
+        typedef struct {
+                DWORD                   dwRpcStructureVersion;
+                DWORD                   dwReserved0;
+                [range(0,500000)]       DWORD                   dwZoneCount;
+                [size_is(dwZoneCount)] PDNS_RPC_ZONE_DOTNET     ZoneArray[];
+        }
+        DNS_RPC_ZONE_LIST_DOTNET;
+#define DNS_RPC_ZONE_LIST DNS_RPC_ZONE_LIST_DOTNET
+
+        /* Zone information */
+        typedef struct {
+                [string, charset(UTF8)] char * pszZoneName;
+                DWORD       dwZoneType;
+                BOOL       fReverse;
+                dns_zone_update       fAllowUpdate;
+                DWORD       fPaused;
+                DWORD       fShutdown;
+                DWORD       fAutoCreated;
+
+                /* Database info */
+                DWORD       fUseDatabase;
+                [string, charset(UTF8)] char * pszDataFile;
+
+                /* Masters */
+                PIP4_ARRAY aipMasters;
+
+                /* Secondaries */
+                DNS_ZONE_SECONDARY_SECURITY      fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL      fNotifyLevel;
+                PIP4_ARRAY aipSecondaries;
+                PIP4_ARRAY aipNotify;
+
+                /* WINS or NetBIOS lookup */
+                BOOL      fUseWins;
+                BOOL      fUseNbstat;
+
+                /* Aging */
+                BOOL         fAging;
+                DWORD         dwNoRefreshInterval;
+                DWORD         dwRefreshInterval;
+                DWORD         dwAvailForScavengeTime;
+                PIP4_ARRAY    aipScavengeServers;
+
+                /* save some space, just in case */
+                /* avoid versioning issues if possible */
+                DWORD      pvReserved1;
+                DWORD      pvReserved2;
+                DWORD      pvReserved3;
+                DWORD       pvReserved4;
+        }
+        DNS_RPC_ZONE_INFO_W2K;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                [string, charset(UTF8)] char * pszZoneName;
+                DWORD       dwZoneType;
+                BOOL       fReverse;
+                dns_zone_update       fAllowUpdate;
+                DWORD       fPaused;
+                DWORD       fShutdown;
+                DWORD       fAutoCreated;
+
+                /* Database info */
+                DWORD       fUseDatabase;
+                [string, charset(UTF8)] char * pszDataFile;
+
+                /* Masters */
+                PIP4_ARRAY aipMasters;
+
+                /* Secondaries */
+                DNS_ZONE_SECONDARY_SECURITY      fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL      fNotifyLevel;
+                PIP4_ARRAY aipSecondaries;
+                PIP4_ARRAY aipNotify;
+
+                /* WINS or NetBIOS lookup */
+                BOOL      fUseWins;
+                BOOL      fUseNbstat;
+
+                /* Aging */
+                BOOL         fAging;
+                DWORD         dwNoRefreshInterval;
+                DWORD         dwRefreshInterval;
+                DWORD         dwAvailForScavengeTime;
+                PIP4_ARRAY    aipScavengeServers;
+
+                /* Forwarder zones */
+                DWORD      dwForwarderTimeout;
+                DWORD      fForwarderSlave;
+
+                /* Stub zones */
+                PIP4_ARRAY aipLocalMasters;
+
+                /* Directory partition */
+                DWORD       dwDpFlags;
+                [string, charset(UTF8)] char *      pszDpFqdn;
+                [string, charset(UTF16)] wchar_t *   pwszZoneDn;
+
+                /* Xfr time information */
+                DWORD      dwLastSuccessfulSoaCheck;
+                DWORD      dwLastSuccessfulXfr;
+
+                /* save some space, just in case */
+                DWORD      dwReserved1;
+                DWORD         dwReserved2;
+                DWORD         dwReserved3;
+                DWORD         dwReserved4;
+                DWORD         dwReserved5;
+                [string, charset(UTF8)]   char *       pReserved1;
+                [string, charset(UTF8)]   char *       pReserved2;
+                [string, charset(UTF8)]   char *       pReserved3;
+                [string, charset(UTF8)]   char *       pReserved4;
+        }
+        DNS_RPC_ZONE_INFO_DOTNET;
+
+        typedef struct {
+                DWORD               dwRpcStructureVersion;
+                DWORD               dwReserved0;
+
+                [string, charset(UTF8)] char *                  pszZoneName;
+                DWORD                  dwZoneType;
+                BOOL                  fReverse;
+                dns_zone_update        fAllowUpdate;
+                DWORD                  fPaused;
+                DWORD                  fShutdown;
+                DWORD                  fAutoCreated;
+
+                /* Database info */
+                DWORD                  fUseDatabase;
+                [string, charset(UTF8)] char *                  pszDataFile;
+
+                /* Masters */
+                PDNS_ADDR_ARRAY        aipMasters;
+
+                /* Secondaries */
+                DNS_ZONE_SECONDARY_SECURITY                  fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL                  fNotifyLevel;
+                PDNS_ADDR_ARRAY        aipSecondaries;
+                PDNS_ADDR_ARRAY        aipNotify;
+
+                /* WINS or NetBIOS lookup */
+                BOOL              fUseWins;
+                BOOL              fUseNbstat;
+
+                /* Aging */
+                BOOL                  fAging;
+                DWORD                  dwNoRefreshInterval;
+                DWORD                  dwRefreshInterval;
+                DWORD                  dwAvailForScavengeTime;
+                PDNS_ADDR_ARRAY        aipScavengeServers;
+
+                /* Forwarder zones */
+                DWORD              dwForwarderTimeout;
+                DWORD              fForwarderSlave;
+
+                /* Stub zones */
+                PDNS_ADDR_ARRAY        aipLocalMasters;
+
+                /* Directory partition */
+                DWORD              dwDpFlags;
+                [string, charset(UTF8)] char *              pszDpFqdn;
+                [string, charset(UTF16)] wchar_t *             pwszZoneDn;
+                /* Xfr time information */
+                DWORD              dwLastSuccessfulSoaCheck;
+                DWORD              dwLastSuccessfulXfr;
+
+                DWORD                 fQueuedForBackgroundLoad;
+                DWORD                 fBackgroundLoadInProgress;
+                BOOL                  fReadOnlyZone;
+
+                /* Additional zone transfer information */
+                DWORD              dwLastXfrAttempt;
+                DWORD              dwLastXfrResult;
+        }
+        DNS_RPC_ZONE_INFO_LONGHORN;
+#define DNS_RPC_ZONE_INFO DNS_RPC_ZONE_INFO_LONGHORN
+
+        /* Zone property data */
+        typedef struct {
+                DNS_ZONE_SECONDARY_SECURITY       fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL       fNotifyLevel;
+                PIP4_ARRAY aipSecondaries;
+                PIP4_ARRAY aipNotify;
+        }
+        DNS_RPC_ZONE_SECONDARIES_W2K;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                DNS_ZONE_SECONDARY_SECURITY         fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL         fNotifyLevel;
+                PIP4_ARRAY    aipSecondaries;
+                PIP4_ARRAY    aipNotify;
+        }
+        DNS_RPC_ZONE_SECONDARIES_DOTNET;
+
+        typedef struct {
+                DWORD               dwRpcStructureVersion;
+                DWORD               dwReserved0;
+
+                DNS_ZONE_SECONDARY_SECURITY                 fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL                 fNotifyLevel;
+                PDNS_ADDR_ARRAY       aipSecondaries;
+                PDNS_ADDR_ARRAY       aipNotify;
+        }
+        DNS_RPC_ZONE_SECONDARIES_LONGHORN;
+#define DNS_RPC_ZONE_SECONDARIES DNS_RPC_ZONE_SECONDARIES_LONGHORN
+
+        /* Zone database */
+        typedef struct {
+                DWORD       fDsIntegrated;
+                [string, charset(UTF8)] char * pszFileName;
+        }
+        DNS_RPC_ZONE_DATABASE_W2K;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                DWORD       fDsIntegrated;
+                [string, charset(UTF8)] char * pszFileName;
+        }
+        DNS_RPC_ZONE_DATABASE_DOTNET;
+#define DNS_RPC_ZONE_DATABASE DNS_RPC_ZONE_DATABASE_DOTNET
+
+        /* Zone create data */
+        typedef struct {
+                [string, charset(UTF8)] char *       pszZoneName;
+                DWORD       dwZoneType;
+                dns_zone_update       fAllowUpdate;
+                BOOL       fAging;
+                DWORD       dwFlags;
+
+                /*   Database info */
+
+                [string, charset(UTF8)] char *       pszDataFile;
+                DWORD       fDsIntegrated;
+                DWORD       fLoadExisting;
+
+                /*   Admin name (if auto-create SOA) */
+
+                [string, charset(UTF8)] char *           pszAdmin;
+
+                /*   Masters (if secondary) */
+
+                PIP4_ARRAY   aipMasters;
+
+                /*   Secondaries */
+
+                PIP4_ARRAY   aipSecondaries;
+                DNS_ZONE_SECONDARY_SECURITY        fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL        fNotifyLevel;
+
+                /*   Reserve some space to avoid versioning issues */
+
+                [string, charset(UTF8)]   char   *       pvReserved1;
+                [string, charset(UTF8)]   char   *       pvReserved2;
+                [string, charset(UTF8)]   char   *       pvReserved3;
+                [string, charset(UTF8)]   char   *       pvReserved4;
+                [string, charset(UTF8)]   char   *       pvReserved5;
+                [string, charset(UTF8)]   char   *       pvReserved6;
+                [string, charset(UTF8)]   char   *       pvReserved7;
+                [string, charset(UTF8)]   char   *       pvReserved8;
+                DWORD         dwReserved1;
+                DWORD         dwReserved2;
+                DWORD         dwReserved3;
+                DWORD         dwReserved4;
+                DWORD         dwReserved5;
+                DWORD         dwReserved6;
+                DWORD         dwReserved7;
+                DWORD         dwReserved8;
+        }
+        DNS_RPC_ZONE_CREATE_INFO_W2K;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                [string, charset(UTF8)] char *       pszZoneName;
+                DWORD       dwZoneType;
+                dns_zone_update       fAllowUpdate;
+                BOOL       fAging;
+                DWORD       dwFlags;
+
+                /*   Database info */
+
+                [string, charset(UTF8)] char *       pszDataFile;
+                DWORD       fDsIntegrated;
+                DWORD       fLoadExisting;
+
+                /*   Admin name (if auto-create SOA) */
+
+                [string, charset(UTF8)] char *            pszAdmin;
+
+                /*   Masters (if secondary) */
+
+                PIP4_ARRAY    aipMasters;
+
+                /*   Secondaries */
+
+                PIP4_ARRAY    aipSecondaries;
+                DNS_ZONE_SECONDARY_SECURITY         fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL         fNotifyLevel;
+
+                /*   Forwarder zones */
+
+                DWORD         dwTimeout;
+                DWORD         fRecurseAfterForwarding;
+
+                /*   Directory partition */
+
+                DWORD       dwDpFlags;      /* specify built-in DP or */
+                [string, charset(UTF8)] char *       pszDpFqdn;     /*      UTF8 FQDN of partition */
+
+                DWORD       dwReserved[ 32 ];
+        }
+        DNS_RPC_ZONE_CREATE_INFO_DOTNET;
+
+        typedef struct {
+                DWORD                  dwRpcStructureVersion;
+                DWORD                  dwReserved0;
+
+                [string, charset(UTF8)] char *                  pszZoneName;
+                DWORD                  dwZoneType;
+                dns_zone_update                  fAllowUpdate;
+                BOOL                  fAging;
+                DWORD                  dwFlags;
+
+                /*   Database info */
+
+                [string, charset(UTF8)] char *                  pszDataFile;
+                DWORD                  fDsIntegrated;
+                DWORD                  fLoadExisting;
+
+                /*   Admin name (if auto-create SOA) */
+
+                [string, charset(UTF8)] char *                    pszAdmin;
+
+                /*   Masters (if secondary) */
+
+                PDNS_ADDR_ARRAY        aipMasters;
+
+                /*   Secondaries */
+
+                PDNS_ADDR_ARRAY        aipSecondaries;
+                DNS_ZONE_SECONDARY_SECURITY                  fSecureSecondaries;
+                DNS_ZONE_NOTIFY_LEVEL                  fNotifyLevel;
+
+                /*   Forwarder zones */
+
+                DWORD                  dwTimeout;
+                DWORD                  fRecurseAfterForwarding;
+
+                /*   Directory partition */
+
+                DWORD                  dwDpFlags;      /* specify built-in DP or */
+                [string, charset(UTF8)] char *                  pszDpFqdn;     /*      UTF8 FQDN of partition */
+
+                DWORD               dwReserved[ 32 ];
+        }
+        DNS_RPC_ZONE_CREATE_INFO_LONGHORN;
+#define DNS_RPC_ZONE_CREATE_INFO DNS_RPC_ZONE_CREATE_INFO_LONGHORN
+
+        /* Zone export */
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                [string, charset(UTF8)] char * pszZoneExportFile;
+        }
+        DNS_RPC_ZONE_EXPORT_INFO;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+
+                DWORD       dwFilter;
+                [string, charset(UTF8)] char *       pszPartitionFqdn;
+                [string, charset(UTF8)] char *       pszQueryString;
+
+                DNS_EXTENSION     pszReserved[ 6 ];
+        }
+        DNS_RPC_ENUM_ZONES_FILTER;
+
+        /* Forwarders information */
+        typedef struct {
+                DWORD       fRecurseAfterForwarding;
+                DWORD       dwForwardTimeout;
+                PIP4_ARRAY aipForwarders;
+        }
+        DNS_RPC_FORWARDERS_W2K;
+
+        typedef struct {
+                DWORD       dwRpcStructureVersion;
+                DWORD       dwReserved0;
+                DWORD       fRecurseAfterForwarding;
+                DWORD       dwForwardTimeout;
+                PIP4_ARRAY aipForwarders;
+        }
+        DNS_RPC_FORWARDERS_DOTNET;
+
+        typedef struct {
+                DWORD               dwRpcStructureVersion;
+                DWORD               dwReserved0;
+                DWORD               fRecurseAfterForwarding;
+                DWORD               dwForwardTimeout;
+                PDNS_ADDR_ARRAY     aipForwarders;
+        }
+        DNS_RPC_FORWARDERS_LONGHORN;
+#define DNS_RPC_FORWARDERS DNS_RPC_FORWARDERS_LONGHORN
+
+
+        /* */
+        /*   DNS autoconfig data types */
+        /* */
+
+        typedef [v1_enum] enum {
+                DNS_RPC_AUTOCONFIG_INTERNAL_ROOTHINTS                   = 0x00000001,
+                DNS_RPC_AUTOCONFIG_INTERNAL_FORWARDERS                  = 0x00000002,
+                DNS_RPC_AUTOCONFIG_INTERNAL_ZONES                               = 0x00000004,
+                DNS_RPC_AUTOCONFIG_INTERNAL_SELFPOINT                   = 0x00000010,
+                DNS_RPC_AUTOCONFIG_INTERNAL_SELFPOINT_PREPEND   = 0x00000020,
+                DNS_RPC_AUTOCONFIG_INTERNAL_SELFPOINT_APPEND    = 0x00000040,
+                DNS_RPC_AUTOCONFIG_INTERNAL_RETURN_ERROR                = 0x00008000,
+                DNS_RPC_AUTOCONFIG_ALL                                                  = 0xFFFFFFFF
+        }
+        DNS_RPC_AUTOCONFIG;
+
+        typedef struct {
+                DWORD                  dwRpcStructureVersion;
+                DWORD                  dwReserved0;
+                DNS_RPC_AUTOCONFIG     dwAutoConfigFlags;
+                DWORD                  dwReserved1;
+                [string, charset(UTF8)] char * pszNewDomainName;
+        }
+        DNS_RPC_AUTOCONFIGURE;
+
+
+        /* */
+        /*   DNS logging data types */
+        /* */
+
+        typedef [bitmap32bit] bitmap {
+                DNS_EVENT_LOG_SUCCESS                   = 0x00000000,
+                DNS_EVENT_LOG_ERROR_TYPE                = 0x00000001,
+                DNS_EVENT_LOG_WARNING_TYPE              = 0x00000002,
+                DNS_EVENT_LOG_INFORMATION_TYPE  = 0x00000004
+        }
+        DNS_EVENT_LOG_TYPES;
+
+        typedef [bitmap32bit] bitmap {
+                DNS_RPC_VIEW_AUTHORITY_DATA             = 0x00000001,
+                DNS_RPC_VIEW_CACHE_DATA                 = 0x00000002,
+                DNS_RPC_VIEW_GLUE_DATA                  = 0x00000004,
+                DNS_RPC_VIEW_ROOT_HINT_DATA             = 0x00000008,
+                DNS_RPC_VIEW_ADDITIONAL_DATA    = 0x00000010,
+                DNS_RPC_VIEW_NO_CHILDREN                = 0x00010000,
+                DNS_RPC_VIEW_ONLY_CHILDREN              = 0x00020000
+        }
+        DNS_SELECT_FLAGS;
+
+
+        /* */
+        /*   DNS statistics data types */
+        /* */
+
+        typedef struct {
+                DWORD       StatId;
+                WORD        wLength;
+                BOOLEAN     fClear;
+                UCHAR       fReserved;
+        }
+        DNSSRV_STAT_HEADER;
+
+        typedef struct {
+                DNSSRV_STAT_HEADER Header;
+                BYTE                Buffer[1];
+        }
+        DNSSRV_STAT;
+
+
+        /* */
+        /*   DNS Typid and Union of all RPC data types */
+        /* */
+
+        typedef [v1_enum] enum {
+                DNSSRV_TYPEID_NULL                      = 0,
+                DNSSRV_TYPEID_DWORD                     = 1,
+                DNSSRV_TYPEID_LPSTR                     = 2,
+                DNSSRV_TYPEID_LPWSTR                    = 3,
+                DNSSRV_TYPEID_IPARRAY                   = 4,
+                DNSSRV_TYPEID_BUFFER                    = 5,
+                DNSSRV_TYPEID_SERVER_INFO_W2K           = 6,
+                DNSSRV_TYPEID_STATS                     = 7,
+                DNSSRV_TYPEID_FORWARDERS_W2K            = 8,
+                DNSSRV_TYPEID_ZONE_W2K                  = 9,
+                DNSSRV_TYPEID_ZONE_INFO_W2K             = 10,
+                DNSSRV_TYPEID_ZONE_SECONDARIES_W2K      = 11,
+                DNSSRV_TYPEID_ZONE_DATABASE_W2K         = 12,
+                DNSSRV_TYPEID_ZONE_TYPE_RESET_W2K       = 13,
+                DNSSRV_TYPEID_ZONE_CREATE_W2K           = 14,
+                DNSSRV_TYPEID_NAME_AND_PARAM            = 15,
+                DNSSRV_TYPEID_ZONE_LIST_W2K             = 16,
+                DNSSRV_TYPEID_ZONE_RENAME               = 17,
+                DNSSRV_TYPEID_ZONE_EXPORT               = 18,
+                DNSSRV_TYPEID_SERVER_INFO_DOTNET        = 19,
+                DNSSRV_TYPEID_FORWARDERS_DOTNET         = 20,
+                DNSSRV_TYPEID_ZONE                      = 21,
+                DNSSRV_TYPEID_ZONE_INFO_DOTNET          = 22,
+                DNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET   = 23,
+                DNSSRV_TYPEID_ZONE_DATABASE             = 24,
+                DNSSRV_TYPEID_ZONE_TYPE_RESET_DOTNET    = 25,
+                DNSSRV_TYPEID_ZONE_CREATE_DOTNET        = 26,
+                DNSSRV_TYPEID_ZONE_LIST                 = 27,
+                DNSSRV_TYPEID_DP_ENUM                   = 28,
+                DNSSRV_TYPEID_DP_INFO                   = 29,
+                DNSSRV_TYPEID_DP_LIST                   = 30,
+                DNSSRV_TYPEID_ENLIST_DP                 = 31,
+                DNSSRV_TYPEID_ZONE_CHANGE_DP            = 32,
+                DNSSRV_TYPEID_ENUM_ZONES_FILTER         = 33,
+                DNSSRV_TYPEID_ADDRARRAY                 = 34,
+                DNSSRV_TYPEID_SERVER_INFO               = 35,
+                DNSSRV_TYPEID_ZONE_INFO                 = 36,
+                DNSSRV_TYPEID_FORWARDERS                = 37,
+                DNSSRV_TYPEID_ZONE_SECONDARIES          = 38,
+                DNSSRV_TYPEID_ZONE_TYPE_RESET           = 39,
+                DNSSRV_TYPEID_ZONE_CREATE               = 40,
+                DNSSRV_TYPEID_IP_VALIDATE               = 41,
+                DNSSRV_TYPEID_AUTOCONFIGURE             = 42,
+                DNSSRV_TYPEID_UTF8_STRING_LIST          = 43,
+                DNSSRV_TYPEID_UNICODE_STRING_LIST       = 44
+        }
+        DNS_RPC_TYPEID;
+
+        typedef [switch_type(uint3264)] union {
+                [case(DNSSRV_TYPEID_NULL)]      PBYTE       Null;
+
+                [case(DNSSRV_TYPEID_DWORD)]         DWORD        Dword;
+
+                [case(DNSSRV_TYPEID_LPSTR)]         [string, charset(UTF8)] char *        String;
+
+                [case(DNSSRV_TYPEID_LPWSTR)]        [string, charset(UTF16)] wchar_t *     WideString;
+
+                [case(DNSSRV_TYPEID_IPARRAY)]       IP4_ARRAY   *IpArray;
+
+                [case(DNSSRV_TYPEID_BUFFER)]
+                DNS_RPC_BUFFER                              *Buffer;
+
+                [case(DNSSRV_TYPEID_SERVER_INFO_W2K)]
+                DNS_RPC_SERVER_INFO_W2K                     *ServerInfoW2K;
+
+                [case(DNSSRV_TYPEID_STATS)]
+                DNSSRV_STAT                                 *Stats;
+
+                [case(DNSSRV_TYPEID_FORWARDERS_W2K)]
+                DNS_RPC_FORWARDERS_W2K                      *ForwardersW2K;
+
+                [case(DNSSRV_TYPEID_ZONE_W2K)]
+                DNS_RPC_ZONE_W2K                            *ZoneW2K;
+
+                [case(DNSSRV_TYPEID_ZONE_INFO_W2K)]
+                DNS_RPC_ZONE_INFO_W2K                       *ZoneInfoW2K;
+
+                [case(DNSSRV_TYPEID_ZONE_SECONDARIES_W2K)]
+                DNS_RPC_ZONE_SECONDARIES_W2K                *SecondariesW2K;
+
+                [case(DNSSRV_TYPEID_ZONE_DATABASE_W2K)]
+                DNS_RPC_ZONE_DATABASE_W2K                   *DatabaseW2K;
+
+                [case(DNSSRV_TYPEID_ZONE_CREATE_W2K)]
+                DNS_RPC_ZONE_CREATE_INFO_W2K                *ZoneCreateW2K;
+
+                [case(DNSSRV_TYPEID_NAME_AND_PARAM)]
+                DNS_RPC_NAME_AND_PARAM                      *NameAndParam;
+
+                [case(DNSSRV_TYPEID_ZONE_LIST_W2K)]
+                DNS_RPC_ZONE_LIST_W2K                       *ZoneListW2K;
+
+                [case(DNSSRV_TYPEID_SERVER_INFO_DOTNET)]
+                DNS_RPC_SERVER_INFO_DOTNET                  *ServerInfoDotNet;
+
+                [case(DNSSRV_TYPEID_FORWARDERS_DOTNET)]
+                DNS_RPC_FORWARDERS_DOTNET                   *ForwardersDotNet;
+
+                [case(DNSSRV_TYPEID_ZONE)]
+                DNS_RPC_ZONE                                *Zone;
+
+                [case(DNSSRV_TYPEID_ZONE_INFO_DOTNET)]
+                DNS_RPC_ZONE_INFO_DOTNET                    *ZoneInfoDotNet;
+
+                [case(DNSSRV_TYPEID_ZONE_SECONDARIES_DOTNET)]
+                DNS_RPC_ZONE_SECONDARIES_DOTNET        *SecondariesDotNet;
+
+                [case(DNSSRV_TYPEID_ZONE_DATABASE)]
+                DNS_RPC_ZONE_DATABASE                       *Database;
+
+                [case(DNSSRV_TYPEID_ZONE_CREATE_DOTNET)]
+                DNS_RPC_ZONE_CREATE_INFO_DOTNET             *ZoneCreateDotNet;
+
+                [case(DNSSRV_TYPEID_ZONE_LIST)]
+                DNS_RPC_ZONE_LIST                           *ZoneList;
+
+                [case(DNSSRV_TYPEID_ZONE_EXPORT)]
+                DNS_RPC_ZONE_EXPORT_INFO                    *ZoneExport;
+
+                [case(DNSSRV_TYPEID_DP_INFO)]
+                DNS_RPC_DP_INFO                             *DirectoryPartition;
+
+                [case(DNSSRV_TYPEID_DP_ENUM)]
+                DNS_RPC_DP_ENUM                             *DirectoryPartitionEnum;
+
+                [case(DNSSRV_TYPEID_DP_LIST)]
+                DNS_RPC_DP_LIST                             *DirectoryPartitionList;
+
+                [case(DNSSRV_TYPEID_ENLIST_DP)]
+                DNS_RPC_ENLIST_DP                           *EnlistDirectoryPartition;
+
+                [case(DNSSRV_TYPEID_ZONE_CHANGE_DP)]
+                DNS_RPC_ZONE_CHANGE_DP                 *ZoneChangeDirectoryPartition;
+
+                [case(DNSSRV_TYPEID_ENUM_ZONES_FILTER)]
+                DNS_RPC_ENUM_ZONES_FILTER                   *EnumZonesFilter;
+
+                [case(DNSSRV_TYPEID_ADDRARRAY)]
+                DNS_ADDR_ARRAY                              *AddrArray;
+
+                [case(DNSSRV_TYPEID_SERVER_INFO)]
+                DNS_RPC_SERVER_INFO                         *ServerInfo;
+
+                [case(DNSSRV_TYPEID_ZONE_CREATE)]
+                DNS_RPC_ZONE_CREATE_INFO                    *ZoneCreate;
+
+                [case(DNSSRV_TYPEID_FORWARDERS)]
+                DNS_RPC_FORWARDERS                          *Forwarders;
+
+                [case(DNSSRV_TYPEID_ZONE_SECONDARIES)]
+                DNS_RPC_ZONE_SECONDARIES                    *Secondaries;
+
+                [case(DNSSRV_TYPEID_IP_VALIDATE)]
+                DNS_RPC_IP_VALIDATE                         *IpValidate;
+
+                [case(DNSSRV_TYPEID_ZONE_INFO)]
+                DNS_RPC_ZONE_INFO                           *ZoneInfo;
+
+                [case(DNSSRV_TYPEID_AUTOCONFIGURE)]
+                DNS_RPC_AUTOCONFIGURE                       *AutoConfigure;
+
+                [case(DNSSRV_TYPEID_UTF8_STRING_LIST)]
+                DNS_RPC_UTF8_STRING_LIST                    *Utf8StringList;
+        } DNSSRV_RPC_UNION;
+
+
+        /* */
+        /*   DNS RPC interface */
+        /* */
+
+        typedef [public,gensize] struct {
+                [value((12+ndr_size_DNS_RPC_NAME(&dnsNodeName,0)+3) & ~3)]  uint16 wLength;
+                uint16 wRecordCount;
+                uint32 dwFlags;
+                uint32 dwChildCount;
+                DNS_RPC_NAME dnsNodeName;
+                DNS_RPC_RECORD records[wRecordCount];
+        } DNS_RPC_RECORDS;
+
+        typedef [public,nopull,nopush,gensize] struct {
+                uint32 count;
+                DNS_RPC_RECORDS rec[count];
+        } DNS_RPC_RECORDS_ARRAY;
+
+        WERROR DnssrvOperation(
+                [in,unique,string,charset(UTF16)] uint16        *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8          *pszZone,
+                [in]                      DWORD                  dwContext,
+                [in,unique,string,charset(UTF8)] uint8          *pszOperation,
+                [in]                      DNS_RPC_TYPEID         dwTypeId,
+                [in, switch_is(dwTypeId)] DNSSRV_RPC_UNION       pData
+        );
+
+        WERROR DnssrvQuery(
+                [in,unique,string,charset(UTF16)] uint16       *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8         *pszZone,
+                [in,unique,string,charset(UTF8)] uint8         *pszOperation,
+                [out]                         DNS_RPC_TYPEID   *pdwTypeId,
+                [out, switch_is(*pdwTypeId)]  DNSSRV_RPC_UNION *ppData
+        );
+
+        WERROR DnssrvComplexOperation(
+                [in,unique,string,charset(UTF16)] uint16       *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8         *pszZone,
+                [in,unique,string,charset(UTF8)] uint8         *pszOperation,
+                [in]                          DNS_RPC_TYPEID    dwTypeIn,
+                [in, switch_is(dwTypeIn)]     DNSSRV_RPC_UNION  pDataIn,
+                [out]                         DNS_RPC_TYPEID   *pdwTypeOut,
+                [out, switch_is(*pdwTypeOut)] DNSSRV_RPC_UNION *ppDataOut
+        );
+
+        WERROR DnssrvEnumRecords(
+                [in,unique,string,charset(UTF16)] uint16       *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8         *pszZone,
+                [in,unique,string,charset(UTF8)]  uint8        *pszNodeName,
+                [in,unique,string,charset(UTF8)]  uint8        *pszStartChild,
+                [in]                           dns_record_type          wRecordType,
+                [in]                           DNS_SELECT_FLAGS        fSelectFlag,
+                [in,unique,string,charset(UTF8)]  uint8        *pszFilterStart,
+                [in,unique,string,charset(UTF8)]  uint8        *pszFilterStop,
+                [out]                          DWORD           *pdwBufferLength,
+                [out,ref,subcontext(4),subcontext_size(*pdwBufferLength)] DNS_RPC_RECORDS_ARRAY **pBuffer
+        );
+
+        WERROR DnssrvUpdateRecord(
+                [in,unique,string,charset(UTF16)] uint16     *pwszServerName,
+                [in,unique,string,charset(UTF8)]  uint8      *pszZone,
+                [in,unique,string,charset(UTF8)]  uint8      *pszNodeName,
+                [in, unique]    DNS_RPC_RECORD_BUF           *pAddRecord,
+                [in, unique]    DNS_RPC_RECORD_BUF           *pDeleteRecord
+        );
+
+        WERROR DnssrvOperation2(
+                [in]            DNS_RPC_CLIENT_VERSION     dwClientVersion,
+                [in]            uint32                     dwSettingFlags,
+                [in,unique,string,charset(UTF16)] uint16  *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8    *pszZone,
+                [in]            DWORD                      dwContext,
+                [in,unique,string,charset(UTF8)] uint8    *pszOperation,
+                [in]            DNS_RPC_TYPEID             dwTypeId,
+                [in, switch_is(dwTypeId)] DNSSRV_RPC_UNION pData
+        );
+
+        WERROR DnssrvQuery2(
+                [in]            DNS_RPC_CLIENT_VERSION   dwClientVersion,
+                [in]            uint32                   dwSettingFlags,
+                [in,unique,string,charset(UTF16)] uint16        *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8         *pszZone,
+                [in,unique,string,charset(UTF8)] uint8         *pszOperation,
+                [out]                         DNS_RPC_TYPEID          *pdwTypeId,
+                [out, switch_is(*pdwTypeId)]  DNSSRV_RPC_UNION        *ppData
+        );
+
+        WERROR DnssrvComplexOperation2(
+                [in]            DNS_RPC_CLIENT_VERSION          dwClientVersion,
+                [in]            uint32                          dwSettingFlags,
+                [in,unique,string,charset(UTF16)] uint16       *pwszServerName,
+                [in,unique,string,charset(UTF8)] uint8         *pszZone,
+                [in,unique,string,charset(UTF8)] uint8         *pszOperation,
+                [in]                          DNS_RPC_TYPEID    dwTypeIn,
+                [in, switch_is(dwTypeIn)]     DNSSRV_RPC_UNION  pDataIn,
+                [out]                         DNS_RPC_TYPEID   *pdwTypeOut,
+                [out, switch_is(*pdwTypeOut)] DNSSRV_RPC_UNION *ppDataOut
+        );
+
+        WERROR DnssrvEnumRecords2(
+                [in]                           DNS_RPC_CLIENT_VERSION   dwClientVersion,
+                [in]                           DWORD                    dwSettingFlags,
+                [in,unique,string,charset(UTF16)] uint16               *pwszServerName,
+                [in,unique,string,charset(UTF8)]  uint8                *pszZone,
+                [in,unique,string,charset(UTF8)]  uint8                *pszNodeName,
+                [in,unique,string,charset(UTF8)]  uint8                *pszStartChild,
+                [in]                           dns_record_type          wRecordType,
+                [in]                           DNS_SELECT_FLAGS         fSelectFlag,
+                [in,unique,string,charset(UTF8)]  uint8                *pszFilterStart,
+                [in,unique,string,charset(UTF8)]  uint8                *pszFilterStop,
+                [out]                             uint32               *pdwBufferLength,
+                [out,ref,subcontext(4),subcontext_size(*pdwBufferLength)] DNS_RPC_RECORDS_ARRAY **pBuffer
+        );
+
+        WERROR DnssrvUpdateRecord2(
+                [in]            DNS_RPC_CLIENT_VERSION    dwClientVersion,
+                [in]            uint32                    dwSettingFlags,
+                [in,unique,string,charset(UTF16)] uint16 *pwszServerName,
+                [in,unique,string,charset(UTF8)]  uint8  *pszZone,
+                [in,string,charset(UTF8)]         uint8  *pszNodeName,
+                [in, unique]    DNS_RPC_RECORD_BUF       *pAddRecord,
+                [in, unique]    DNS_RPC_RECORD_BUF       *pDeleteRecord
+        );
 }

vendor/current/librpc/idl/drsblobs.idl

@@ -19 +19 @@
          * w2k3 uses version 1
          */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_DsAttributeId attid;
                 uint32 version;
@@ -151 +151 @@
                 [in] repsFromToBlob blob
                 );
+
+        /* Replication schedule structures as defined in MS-ADTS 7.1.4.5
+         * Appears as attribute of NTDSConnection object
+         */
+        typedef [public] struct {
+                [value(0)] uint32 type;      /* always 0 */
+                uint32            offset;
+        } scheduleHeader;
+
+        typedef [public] struct {
+                uint8 slots[168];
+        } scheduleSlots;
+
+        typedef [public] struct {
+                uint32             size;
+                [value(0)] uint32  bandwidth;         /* ignored */
+                [value(1)] uint32  numberOfSchedules; /* always 1 */
+                scheduleHeader     headerArray[numberOfSchedules];
+                scheduleSlots      dataArray[numberOfSchedules];
+        } schedule;
 
         /*
@@ -613 +633 @@
         } ForestTrustData;
 
-        /* same as lsa_ForestTrustRecordType */
+        /* same as lsa_ForestTrustRecordType, but only 8 bit */
         typedef [enum8bit] enum {
-                FOREST_TRUST_TOP_LEVEL_NAME = 0,
-                FOREST_TRUST_TOP_LEVEL_NAME_EX = 1,
-                FOREST_TRUST_DOMAIN_INFO = 2
+                FOREST_TRUST_TOP_LEVEL_NAME = LSA_FOREST_TRUST_TOP_LEVEL_NAME,
+                FOREST_TRUST_TOP_LEVEL_NAME_EX = LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX,
+                FOREST_TRUST_DOMAIN_INFO = LSA_FOREST_TRUST_DOMAIN_INFO
         } ForestTrustInfoRecordType;
 
@@ -623 +643 @@
            the same as in lsa.idl, see collision record types */
         typedef [public,gensize,flag(NDR_NOALIGN)] struct {
-                uint32 flags;
+                lsa_ForestTrustRecordFlags flags;
                 NTTIME timestamp;
                 ForestTrustInfoRecordType type;

vendor/current/librpc/idl/drsuapi.idl

@@ -59 +59 @@
         } drsuapi_DrsOptions;
 
+        /* see DRS_MSG_REPMOD_V1 */
+        typedef [public,bitmap32bit] bitmap {
+                DRSUAPI_DRS_UPDATE_FLAGS              = 0x00000001,
+                DRSUAPI_DRS_UPDATE_ADDRESS            = 0x00000002,
+                DRSUAPI_DRS_UPDATE_SCHEDULE           = 0x00000004
+        } drsuapi_DrsUpdate;
+
         /*****************/
         /* Function 0x00 */
@@ -109 +116 @@
 
         /* this is used by w2k */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -116 +123 @@
 
         /* this is used by w2k3 */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -123 +130 @@
         } drsuapi_DsBindInfo28;
 
+        typedef [public] struct {
+                drsuapi_SupportedExtensions supported_extensions;
+                GUID site_guid;
+                uint32 pid;
+                uint32 repl_epoch;
+                drsuapi_SupportedExtensionsExt supported_extensions_ext;
+        } drsuapi_DsBindInfo32;
+
         /* this is used by w2k8 */
-        typedef struct {
+        typedef [public] struct {
                 drsuapi_SupportedExtensions supported_extensions;
                 GUID site_guid;
@@ -133 +148 @@
         } drsuapi_DsBindInfo48;
 
-        typedef struct {
+        /* this is used by w2k12 R2 [MS-DRSR] Section 5.39 */
+        typedef [public] struct {
+                drsuapi_SupportedExtensions supported_extensions;
+                GUID site_guid;
+                uint32 pid;
+                uint32 repl_epoch;
+                drsuapi_SupportedExtensionsExt supported_extensions_ext;
+                GUID config_dn_guid;
+                drsuapi_SupportedExtensionsExt supported_capabilities_ext;
+        } drsuapi_DsBindInfo52;
+
+        typedef [public] struct {
                 [flag(NDR_REMAINING)] DATA_BLOB info;
         } drsuapi_DsBindInfoFallBack;
+
+        typedef [nopull, nopush, noprint] [nodiscriminant] union {
+                [case(24)][subcontext(0), subcontext_size(24)] drsuapi_DsBindInfo24 info24;
+                [case(28)][subcontext(0), subcontext_size(28)] drsuapi_DsBindInfo28 info28;
+                [case(32)][subcontext(0), subcontext_size(32)] drsuapi_DsBindInfo32 info32;
+                [case(48)][subcontext(0), subcontext_size(48)] drsuapi_DsBindInfo48 info48;
+                [case(52)][subcontext(0), subcontext_size(52)] drsuapi_DsBindInfo52 info52;
+                /*
+                 * The size for the defaut case is a bit arbitrary it in fact the value
+                 * of the switch but we can't reference it.
+                 * As we hand(un-)marshall this structure it has 0 impact and makes
+                 * pidl happy for wireshark too
+                 */
+                [default][subcontext(0), subcontext_size(48)] drsuapi_DsBindInfoFallBack Fallback;
+        } drsuapi_DsBindInfo;
+
+        /* the drsuapi_DsBindInfoCtr was this before
+         * typedef [flag(NDR_PAHEX)] struct {
+         *      [range(1,10000)] uint32 length;
+         *      [size_is(length)] uint8 data[];
+         * } drsuapi_DsBindInfo;
+         *
+         * but we don't want the caller to manually decode this blob,
+         * so we're doing it here
+         */
+
+        /*
+         * MS-DRSR.pdf gives the following definition
+        typedef struct {
+                [range(1,10000)] DWORD cb;
+                [size_is(cb)] BYTE rgb[];
+        } DRS_EXTENSIONS;
+
+        But we use a subcontext which has a slighly different signification on how
+        data are laid out.
+        With the MS-DRSR definition we will have
+                size_is_cb cv rgb_array
+        with size_is_cb being a uint3264 and cv being a uint32
+
+        We used to have
+        typedef struct {
+                [range(1,10000)] uint32 length;
+                [switch_is(length)] drsuapi_DsBindInfo info;
+        } drsuapi_DsBindInfoCtr;
 
         typedef [nodiscriminant] union {
@@ -144 +214 @@
         } drsuapi_DsBindInfo;
 
-        /* the drsuapi_DsBindInfoCtr was this before
-         * typedef [flag(NDR_PAHEX)] struct {
-         *      [range(1,10000)] uint32 length;
-         *      [size_is(length)] uint8 data[];
-         * } drsuapi_DsBindInfo;
-         *
-         * but we don't want the caller to manually decode this blob,
-         * so we're doing it here
-         */
-
-        typedef struct {
-                [range(1,10000)] uint32 length;
+        With this definition data is laid out this way:
+        length subcontext_size drsuapi_DsBindInfoxx
+        with length being a uint32 and subcontext_size being a uint3264
+
+        It has clearly an impact on the way things are aligned when using NDR64
+        */
+        typedef [flag(NDR_NOALIGN)] struct {
+                [range(1,10000)] uint3264 length;
+                [value(length)] uint32 __ndr_length;
                 [switch_is(length)] drsuapi_DsBindInfo info;
         } drsuapi_DsBindInfoCtr;
@@ -198 +265 @@
                 [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
                 GUID source_dsa_guid;
-                astring *source_dsa_dns; /* Source DSA dns_name in <guid>._msdcs.<domain_dns> form */
+                [charset(DOS),string] char *source_dsa_dns; /* Source DSA dns_name in <guid>._msdcs.<domain_dns> form */
                 drsuapi_DrsOptions options;
         } drsuapi_DsReplicaSyncRequest1;
@@ -393 +460 @@
                 DRSUAPI_ATTID_displayName                       = 0x0002000d,
                 DRSUAPI_ATTID_hasMasterNCs                      = 0x0002000e,
+                DRSUAPI_ATTID_nCName                            = 0x00020010,
                 DRSUAPI_ATTID_subClassOf                        = 0x00020015,
                 DRSUAPI_ATTID_governsID                         = 0x00020016,
@@ -539 +607 @@
         /* Generic DATA_BLOB values */
         typedef struct {
-                [range(0,10485760),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 __ndr_size;
+                [range(0,26214400),value(ndr_size_DATA_BLOB(0,blob,0))] uint32 __ndr_size;
                 DATA_BLOB *blob;
         } drsuapi_DsAttributeValue;
@@ -799 +867 @@
         typedef struct {
                 [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
-                [charset(UTF16),string] uint16 *source_dsa_address;
+                [charset(UTF8), string] uint8 *source_dsa_address;
                 drsuapi_DrsOptions options;
         } drsuapi_DsReplicaDelRequest1;
@@ -1100 +1168 @@
         /*****************/
         /* Function 0x10 */
+        typedef [v1_enum] enum {
+                DRSUAPI_DC_INFO_CTR_1  = 1,
+                DRSUAPI_DC_INFO_CTR_2  = 2,
+                DRSUAPI_DC_INFO_CTR_3  = 3,
+                DRSUAPI_DC_CONNECTION_CTR_01 = 0xFFFFFFFF
+        } drsuapi_DsGetDCInfoCtrLevels;
+
         typedef struct {
                 [charset(UTF16),string] uint16 *domain_name; /* netbios or dns */
-                int32 level; /* specifies the switch level for the request */
+                drsuapi_DsGetDCInfoCtrLevels level; /* specifies the switch level for the request */
         } drsuapi_DsGetDCInfoRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetDCInfoRequest1 req1;
         } drsuapi_DsGetDCInfoRequest;
@@ -1197 +1272 @@
         } drsuapi_DsGetDCConnectionCtr01;
 
-        typedef [v1_enum] enum {
-                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_DsGetDCInfoCtrLevels;
-
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(drsuapi_DsGetDCInfoCtrLevels)] union {
                 [case(DRSUAPI_DC_INFO_CTR_1)]  drsuapi_DsGetDCInfoCtr1  ctr1;
                 [case(DRSUAPI_DC_INFO_CTR_2)]  drsuapi_DsGetDCInfoCtr2  ctr2;
@@ -1213 +1281 @@
         WERROR drsuapi_DsGetDomainControllerInfo(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsGetDCInfoRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] drsuapi_DsGetDCInfoCtrLevels *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsGetDCInfoCtr *ctr
                 );

vendor/current/librpc/idl/epmapper.idl

@@ -15 +15 @@
  uuid("e1af8308-5d1f-11c9-91a4-08002b14a0fa"), 
  version(3.0), 
- endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
-                  "ncalrpc:[EPMAPPER]"),
+ endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
+          "ncacn_http:[593]", "ncalrpc:[EPMAPPER]"),
  helpstring("EndPoint Mapper"),
  pointer_default(ptr)
@@ -215 +215 @@
         } epm_tower;
 
-        typedef struct {
+        typedef [public] struct {
                 [value(ndr_size_epm_tower(&tower, ndr->flags))] uint32  tower_length;
                 [subcontext(4)] epm_tower tower;

vendor/current/librpc/idl/eventlog6.idl

@@ -65 +65 @@
         typedef struct {
                 [range(0, MAX_RPC_STRING_ARRAY_COUNT)] uint32 count;
-                [size_is(count),charset(UTF16),string] uint16 *ptr;
+                [size_is(count),charset(UTF16),string] uint16 **ptr;
         } eventlog6_StringArray;
 

vendor/current/librpc/idl/frsrpc.idl

@@ -2 +2 @@
 
 import "misc.idl";
+import "fscc.idl";
+import "bkupblobs.idl";
 
 [
@@ -13 +15 @@
 interface frsrpc
 {
+
         /*****************/
         /* Function 0x00 */
@@ -34 +37 @@
                 FRSRPC_CO_FLAG_LOCALCO          = 0x00000020,
                 FRSRPC_CO_FLAG_RETRY            = 0x00000040,
+                FRSRPC_CO_FLAG_INST_INCOMPLETE  = 0x00000080,
                 FRSRPC_CO_FLAG_OUT_OF_ORDER     = 0x00000200,
                 FRSRPC_CO_FLAG_NEW_FILE         = 0x00000400,
@@ -44 +48 @@
                 FRSRPC_CO_FLAG_JUST_OID_RESET   = 0x00800000,
                 FRSRPC_CO_FLAG_COMPRESSED_STAGE = 0x01000000,
-                FRSRPC_CO_FLAG_COMPRESSED_STAGE = 0x01000000,
                 FRSRPC_CO_FLAG_SKIP_VV_UPDATE   = 0x02000000
         } frsrpc_CommPktCoCmdFlags;
 
         const uint32 FRSRPC_CO_IFLAG_NONE = 0x0000000;
+
+        const string FRSRPC_COMPRESSION_GUID = "64d2f7d2-2695-436d-8830-8d3c58701e15";
+
 
         typedef [bitmap32bit,flag(NDR_PAHEX)] bitmap {
@@ -117 +123 @@
         } frsrpc_CommPktCoCmdLocationCmd;
 
-        typedef struct {
+        [public] typedef struct {
                 uint32 sequence_number;
                 frsrpc_CommPktCoCmdFlags flags;
@@ -204 +210 @@
                 [value(0x0002)] uint16 offset_count;
                 [value(0x00000018)] uint32 offset0;
-                [value(0x00000030)] uint32 offset1;/*TODO: is this correct??? */
+                [value(0x00000030)] uint32 offset1;
                 [value(0)] uint32 offset_last;
                 [value(0)] uint32 not_used;
@@ -222 +228 @@
                 FRSRPC_COMMAND_JOINED                   = 0x00000128,
                 FRSRPC_COMMAND_UNJOIN_REMOTE            = 0x00000148,
-                FRSRPC_COMMAND_WJOIN_DONE               = 0x00000136,
+                FRSRPC_COMMAND_VVJOIN_DONE              = 0x00000136,
                 FRSRPC_COMMAND_SEND_STAGE               = 0x00000228
         } frsrpc_CommPktCommand;
@@ -283 +289 @@
                         GUID compression_guid;
                 [case(FRSRPC_COMM_PKT_CHUNK_BLOCK)]
-                        [flag(NDR_REMAINING)] DATA_BLOB block;
+                        DATA_BLOB block;
                 [case(FRSRPC_COMM_PKT_CHUNK_BLOCK_SIZE)]
                         hyper block_size;
@@ -295 +301 @@
                         GUID co_guid;
                 [case(FRSRPC_COMM_PKT_CHUNK_CO_SEQUENCE_NUMBER)]
-                        uint32 co_sequnence_number;
+                        uint32 co_sequence_number;
                 [case(FRSRPC_COMM_PKT_CHUNK_REMOTE_CO)][subcontext(4)]
                         frsrpc_CommPktChangeOrderCommand remote_co;
                 [case(FRSRPC_COMM_PKT_CHUNK_CO_EXT_WIN2K)][subcontext(4)]
                         frsrpc_CommPktCoRecordExtensionWin2k co_ext_win2k;
-                [case(FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2)][subcontext(4)]
+                [case(FRSRPC_COMM_PKT_CHUNK_CO_EXTENTION_2)]
                         frsrpc_CommPktChangeOrderRecordExtension co_extension2;
                 [case(FRSRPC_COMM_PKT_CHUNK_EOP)]
-                        [value(0xFFFFFFFF)] uint32 bop;
+                        [value(0xFFFFFFFF)] uint32 bopend;
         } frsrpc_CommPktChunkData;
 
@@ -333 +339 @@
         } frsrpc_CommPktMinor;
 
-        typedef struct {
+        [public] typedef struct {
                 frsrpc_CommPktMajor major;
                 frsrpc_CommPktMinor minor;
@@ -345 +351 @@
                 [subcontext(4),subcontext_size(pkt_len)]
                         frsrpc_CommPktChunkCtr *ctr;
-                [value(0)] uint32 data_name;
-                [value(0)] uint32 data_handle;
+                [value(0)] uint3264 data_name;
+                [value(0)] uint3264 data_handle;
         } frsrpc_FrsSendCommPktReq;
 
@@ -390 +396 @@
         );
 
+        typedef [public,flag(NDR_NOALIGN)] struct {
+                uint32 major;
+                uint32 minor;
+                uint32 dataHigh;
+                uint32 dataLow;
+                uint16 compression;
+                uint8 unused[6];
+                fscc_FileNetworkOpenInformation attributes;
+                frsrpc_CommPktChangeOrderCommand command;
+                fscc_FileObjectIdBuffer_2 fileObjId;
+                frsrpc_CommPktCoRecordExtensionWin2k cocExt;
+                GUID compressionGuid;
+                uint32 encDataHigh;
+                uint32 encDataLow;
+                hyper dataSize;
+                uint32 reparseDataPresent;
+                uint32 reparseDataHigh;
+                uint32 reparseDataLow;
+                uint32 padding2;
+        } frsrpc_StageHeader;
+
         /*****************/
         /* Function 0x03 */
         WERROR frsrpc_FrsNOP();
 
+        /*
+         *For Op from 4 to 10 Microsoft use
+         *the notation OpnumxxNotUsedOnWire
+         *where xx is the number of the OP.
+         *They are only declared in the IDL of MS-FRS1.pdf.
+         *Not in the core of the document.
+         */
+
         /*****************/
         /* Function 0x04 */
-        [todo] void FRSRPC_BACKUP_COMPLETE();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE();*/
 
         /*****************/
         /* Function 0x05 */
-        [todo] void FRSRPC_BACKUP_COMPLETE_5();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE_5();*/
 
         /*****************/
         /* Function 0x06 */
-        [todo] void FRSRPC_BACKUP_COMPLETE_6();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE_6();*/
 
         /*****************/
         /* Function 0x07 */
-        [todo] void FRSRPC_BACKUP_COMPLETE_7();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE_7();*/
 
         /*****************/
         /* Function 0x08 */
-        [todo] void FRSRPC_BACKUP_COMPLETE_8();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE_8();*/
 
         /*****************/
         /* Function 0x09 */
-        [todo] void FRSRPC_BACKUP_COMPLETE_9();
+        /*[todo] void FRSRPC_BACKUP_COMPLETE_9();*/
 
         /*****************/
         /* Function 0x0a */
-        [todo] void FRSRPC_VERIFY_PROMOTION_PARENT_EX();
+        /*[todo] void FRSRPC_VERIFY_PROMOTION_PARENT_EX();*/
 }

vendor/current/librpc/idl/frstrans.idl

@@ -59 +59 @@
         } frstrans_UpdateStatus;
 
-        typedef struct {
+        typedef [public] struct {
                 GUID db_guid;
                 hyper low;
@@ -186 +186 @@
         /*****************/
         /* Function 0x0c */
-        [todo] void FRSTRANS_RDC_CLOSE();
+        WERROR frstrans_RdcClose(
+                [in,out,ref] policy_handle *server_context
+                );
 
         /*****************/
@@ -278 +280 @@
         /*****************/
         /* Function 0x0f */
-        typedef pipe uint8 frstrans_BytePipe;
+        typedef [flag(NDR_PAHEX)] pipe uint8 frstrans_BytePipe;
 
         WERROR frstrans_RawGetFileDataAsync(

vendor/current/librpc/idl/idl_types.h

@@ -9 +9 @@
 #define STR_CHARLEN     LIBNDR_FLAG_STR_CHARLEN
 #define STR_UTF8        LIBNDR_FLAG_STR_UTF8
+#define STR_RAW8        LIBNDR_FLAG_STR_RAW8
 
 /*
@@ -24 +25 @@
 */
 #define utf8string      [flag(STR_UTF8|STR_NULLTERM)] string
+
+/*
+  a null terminated "raw" string (null terminated byte sequence)
+*/
+#define raw8string      [flag(STR_RAW8|STR_NULLTERM)] string
 
 /*

vendor/current/librpc/idl/idmap.idl

@@ -20 +20 @@
         } unixid;
 
-        typedef[public]  enum {
+        typedef [public] enum {
                 ID_UNKNOWN,
                 ID_MAPPED,

vendor/current/librpc/idl/krb5pac.idl

@@ -5 +5 @@
 #include "idl_types.h"
 
-import "security.idl", "netlogon.idl", "samr.idl";
+import "security.idl", "lsa.idl", "netlogon.idl", "samr.idl";
 
 [
@@ -33 +33 @@
 
         typedef struct {
+                lsa_String proxy_target;
+                uint32 num_transited_services;
+                [size_is(num_transited_services)] lsa_String *transited_services;
+        } PAC_CONSTRAINED_DELEGATION;
+
+        typedef struct {
                 [value(2*strlen_m(upn_name))] uint16 upn_size;
                 uint16 upn_offset;
@@ -48 +54 @@
                 PAC_LOGON_INFO *info;
         } PAC_LOGON_INFO_CTR;
+
+        typedef [public] struct {
+                PAC_CONSTRAINED_DELEGATION *info;
+        } PAC_CONSTRAINED_DELEGATION_CTR;
 
         typedef [public,v1_enum] enum {
@@ -67 +77 @@
                 [case(PAC_TYPE_KDC_CHECKSUM)]   PAC_SIGNATURE_DATA kdc_cksum;
                 [case(PAC_TYPE_LOGON_NAME)]     PAC_LOGON_NAME logon_name;
+                [case(PAC_TYPE_CONSTRAINED_DELEGATION)][subcontext(0xFFFFFC01)]
+                        PAC_CONSTRAINED_DELEGATION_CTR constrained_delegation;
                 /* when new PAC info types are added they are supposed to be done
                    in such a way that they are backwards compatible with existing
@@ -111 +123 @@
         } PAC_Validate;
 
-        void decode_pac(
+        [nopython] void decode_pac(
                 [in] PAC_DATA pac
                 );
 
-        void decode_pac_raw(
+        [nopython] void decode_pac_raw(
                 [in] PAC_DATA_RAW pac
                 );
 
-        void decode_login_info(
+        [nopython] void decode_login_info(
                 [in] PAC_LOGON_INFO logon_info
                 );
 
-        void decode_login_info_ctr(
+        [nopython] void decode_login_info_ctr(
                 [in] PAC_LOGON_INFO_CTR logon_info_ctr
                 );
 
-        void decode_pac_validate(
+        [nopython] void decode_pac_validate(
                 [in] PAC_Validate pac_validate
                 );

vendor/current/librpc/idl/lsa.idl

@@ -158 +158 @@
                 LSA_POLICY_AUDIT_LOG_ADMIN              |
                 LSA_POLICY_SERVER_ADMIN                 |
-                LSA_POLICY_LOOKUP_NAMES);
+                LSA_POLICY_LOOKUP_NAMES                 |
+                LSA_POLICY_NOTIFICATION);
 
         const int LSA_POLICY_READ =
@@ -692 +693 @@
         } lsa_TrustDirection;
 
-        typedef [v1_enum] enum {
+        typedef [public,v1_enum] enum {
                 LSA_TRUST_TYPE_DOWNLEVEL  = 0x00000001,
                 LSA_TRUST_TYPE_UPLEVEL    = 0x00000002,
-                LSA_TRUST_TYPE_MIT        = 0x00000003
+                LSA_TRUST_TYPE_MIT        = 0x00000003,
+                LSA_TRUST_TYPE_DCE        = 0x00000004
         } lsa_TrustType;
 
@@ -733 +735 @@
         } lsa_TrustDomainInfoBasic;
 
-        typedef struct {
+        typedef [public] struct {
                 lsa_StringLarge     domain_name;
                 lsa_StringLarge     netbios_name;
@@ -1053 +1055 @@
                 [in]  policy_handle               *policy_handle,
                 [in]  lsa_TrustDomainInfoInfoEx   *info,
-                [in]  lsa_TrustDomainInfoAuthInfoInternal *auth_info,
+                [in]  lsa_TrustDomainInfoAuthInfo *auth_info,
                 [in]  lsa_TrustedAccessMask access_mask,
                 [out] policy_handle               *trustdom_handle
@@ -1187 +1189 @@
                 [in]  policy_handle               *policy_handle,
                 [in]  lsa_TrustDomainInfoInfoEx   *info,
-                [in]  lsa_TrustDomainInfoAuthInfoInternal *auth_info,
+                [in]  lsa_TrustDomainInfoAuthInfoInternal *auth_info_internal,
                 [in]  lsa_TrustedAccessMask access_mask,
                 [out] policy_handle               *trustdom_handle
@@ -1255 +1257 @@
 
         /* Function 0x49 */
+        typedef [bitmap32bit,public] bitmap {
+                /* these apply to LSA_FOREST_TRUST_TOP_LEVEL_NAME */
+                LSA_TLN_DISABLED_NEW            = 0x00000001,
+                LSA_TLN_DISABLED_ADMIN          = 0x00000002,
+                LSA_TLN_DISABLED_CONFLICT       = 0x00000004,
+
+                /* these apply to LSA_FOREST_TRUST_DOMAIN_INFO */
+                LSA_SID_DISABLED_ADMIN          = 0x00000001,
+                LSA_SID_DISABLED_CONFLICT       = 0x00000002,
+                LSA_NB_DISABLED_ADMIN           = 0x00000004,
+                LSA_NB_DISABLED_CONFLICT        = 0x00000008
+        } lsa_ForestTrustRecordFlags;
+
+        const uint32 LSA_TLN_DISABLED_MASK = (
+                                        LSA_TLN_DISABLED_NEW |
+                                        LSA_TLN_DISABLED_ADMIN |
+                                        LSA_TLN_DISABLED_CONFLICT);
+        const uint32 LSA_SID_DISABLED_MASK = (
+                                        LSA_SID_DISABLED_ADMIN |
+                                        LSA_SID_DISABLED_CONFLICT);
+        const uint32 LSA_NB_DISABLED_MASK = (
+                                        LSA_NB_DISABLED_ADMIN |
+                                        LSA_NB_DISABLED_CONFLICT);
+
+        typedef enum {
+                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_ForestTrustRecordType;
+
         typedef struct {
                 [range(0,131072)] uint3264 length;
@@ -1266 +1299 @@
         } lsa_ForestTrustDomainInfo;
 
-        typedef [switch_type(uint32)] union {
+        typedef [switch_type(lsa_ForestTrustRecordType)] union {
                 [case(LSA_FOREST_TRUST_TOP_LEVEL_NAME)] lsa_StringLarge top_level_name;
                 [case(LSA_FOREST_TRUST_TOP_LEVEL_NAME_EX)] lsa_StringLarge top_level_name_ex;
@@ -1273 +1306 @@
         } lsa_ForestTrustData;
 
-        typedef [v1_enum] enum {
-                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_ForestTrustRecordType;
-
-        typedef struct {
-                uint32 flags;
+        typedef struct {
+                lsa_ForestTrustRecordFlags flags;
                 lsa_ForestTrustRecordType type;
-                hyper time;
+                NTTIME_hyper time;
                 [switch_is(type)] lsa_ForestTrustData forest_trust_data;
         } lsa_ForestTrustRecord;
@@ -1292 +1318 @@
         } lsa_ForestTrustInformation;
 
-        NTSTATUS lsa_lsaRQueryForestTrustInformation(
+        [public] NTSTATUS lsa_lsaRQueryForestTrustInformation(
                 [in] policy_handle *handle,
                 [in,ref] lsa_String *trusted_domain_name,
-                [in] uint16 unknown, /* level ? */
+                [in] lsa_ForestTrustRecordType highest_record_type,
                 [out,ref] lsa_ForestTrustInformation **forest_trust_info
                 );
@@ -1308 +1334 @@
         } lsa_ForestTrustCollisionRecordType;
 
-        /* if type is CollisionTdo, flags can be */
-        typedef [bitmap32bit] bitmap {
-                LSA_TLN_DISABLED_NEW            = 0x00000001,
-                LSA_TLN_DISABLED_ADMIN          = 0x00000002,
-                LSA_TLN_DISABLED_CONFLICT       = 0x00000004
-        } lsa_ForestTrustCollisionTDOFlags;
-
-        /* if type is CollisionXref, flags can be */
-        typedef [bitmap32bit] bitmap {
-                LSA_SID_DISABLED_ADMIN          = 0x00000001,
-                LSA_SID_DISABLED_CONFLICT       = 0x00000002,
-                LSA_NB_DISABLED_ADMIN           = 0x00000004,
-                LSA_NB_DISABLED_CONFLICT        = 0x00000008
-        } lsa_ForestTrustCollisionXrefFlags;
-
-        typedef [nodiscriminant] union {
-                [case(LSA_FOREST_TRUST_COLLISION_TDO)] lsa_ForestTrustCollisionTDOFlags flags;
-                [case(LSA_FOREST_TRUST_COLLISION_XREF)] lsa_ForestTrustCollisionXrefFlags flags;
-                [default] uint32 flags;
-        } lsa_ForestTrustCollisionFlags;
-
-        typedef struct {
+        typedef [public] struct {
                 uint32 index;
                 lsa_ForestTrustCollisionRecordType type;
-                [switch_is(type)] lsa_ForestTrustCollisionFlags flags;
+                lsa_ForestTrustRecordFlags flags;
                 lsa_String name;
         } lsa_ForestTrustCollisionRecord;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 count;
                 [size_is(count)] lsa_ForestTrustCollisionRecord **entries;
@@ -1344 +1349 @@
                 [in]      policy_handle *handle,
                 [in,ref]  lsa_StringLarge *trusted_domain_name,
-                [in]      uint16 highest_record_type,
+                [in]      lsa_ForestTrustRecordType highest_record_type,
                 [in,ref]  lsa_ForestTrustInformation *forest_trust_info,
-                [in]      uint8 check_only,
+                [in]      boolean8 check_only,
                 [out,ref] lsa_ForestTrustCollisionInfo **collision_info
                 );

vendor/current/librpc/idl/misc.idl

@@ -78 +78 @@
                 [default,flag(NDR_REMAINING)] DATA_BLOB data;
         } winreg_Data;
+
+        /* SAM database types */
+        typedef [public,v1_enum] enum {
+                SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
+                SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
+                SAM_DATABASE_PRIVS   = 2 /* Privileges */
+        } netr_SamDatabaseID;
+
+        typedef [public,bitmap32bit] bitmap {
+                SV_TYPE_WORKSTATION       = 0x00000001,
+                SV_TYPE_SERVER            = 0x00000002,
+                SV_TYPE_SQLSERVER         = 0x00000004,
+                SV_TYPE_DOMAIN_CTRL       = 0x00000008,
+                SV_TYPE_DOMAIN_BAKCTRL    = 0x00000010,
+                SV_TYPE_TIME_SOURCE       = 0x00000020,
+                SV_TYPE_AFP               = 0x00000040,
+                SV_TYPE_NOVELL            = 0x00000080,
+
+                SV_TYPE_DOMAIN_MEMBER     = 0x00000100,
+                SV_TYPE_PRINTQ_SERVER     = 0x00000200,
+                SV_TYPE_DIALIN_SERVER     = 0x00000400,
+                SV_TYPE_SERVER_UNIX       = 0x00000800,
+                SV_TYPE_NT                = 0x00001000,
+                SV_TYPE_WFW               = 0x00002000,
+                SV_TYPE_SERVER_MFPN       = 0x00004000,
+                SV_TYPE_SERVER_NT         = 0x00008000,
+                SV_TYPE_POTENTIAL_BROWSER = 0x00010000,
+                SV_TYPE_BACKUP_BROWSER    = 0x00020000,
+                SV_TYPE_MASTER_BROWSER    = 0x00040000,
+                SV_TYPE_DOMAIN_MASTER     = 0x00080000,
+                SV_TYPE_SERVER_OSF        = 0x00100000,
+                SV_TYPE_SERVER_VMS        = 0x00200000,
+                SV_TYPE_WIN95_PLUS        = 0x00400000,
+                SV_TYPE_DFS_SERVER        = 0x00800000,
+                SV_TYPE_ALTERNATE_XPORT   = 0x20000000,
+                SV_TYPE_LOCAL_LIST_ONLY   = 0x40000000,
+                SV_TYPE_DOMAIN_ENUM       = 0x80000000
+        } svcctl_ServerType;
+
+        const uint32 SV_TYPE_ALL        = 0xFFFFFFFF;
 }

vendor/current/librpc/idl/nbt.idl

@@ -9 +9 @@
 */
 
-import "misc.idl", "security.idl", "svcctl.idl", "samr.idl";
+import "misc.idl", "security.idl";
 [
-        helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"),
+        helper("../librpc/ndr/ndr_nbt.h"),
         helpstring("NBT messages"),
         uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
@@ -361 +361 @@
                 NBT_SERVER_FULL_SECRET_DOMAIN_6         = 0x00001000,
                 NBT_SERVER_ADS_WEB_SERVICE              = 0x00002000,
+                NBT_SERVER_DS_8                         = 0x00004000,
                 NBT_SERVER_HAS_DNS_NAME                 = 0x20000000,
                 NBT_SERVER_IS_DEFAULT_NC                = 0x40000000,
@@ -394 +395 @@
         } netlogon_command;
 
-        typedef bitmap samr_AcctFlags samr_AcctFlags;
-
         /* query to dc hand marshaled, as it has 'optional'
          * parts */
@@ -403 +402 @@
                 nstring              user_name;
                 astring              mailslot_name;
-                samr_AcctFlags       acct_control;
+                uint32               acct_control;
+                /* samr_AcctFlags       acct_control; */
                 [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
                 /* The manual alignment is required because this
@@ -512 +512 @@
         } nbt_netlogon_response2;
 
-        typedef enum netr_SamDatabaseID netr_SamDatabaseID;
-
         /* used to announce SAM changes - MS-NRPC 2.2.1.5.1 */
         typedef struct {
@@ -546 +544 @@
         } nbt_netlogon_request;
 
-#if 0
+#if 0 
+        /* These responses are all handled manually, as they cannot be encoded in IDL fully
+           
+           See push_nbt_netlogon_response()
+        */
                 [case(NETLOGON_RESPONSE_FROM_PDC)] nbt_netlogon_response_from_pdc response;
                 [case(NETLOGON_RESPONSE_FROM_PDC_USER)] nbt_netlogon_response_from_pdc2 response2;

vendor/current/librpc/idl/netlogon.idl

@@ -11 +11 @@
 cpp_quote("#define netr_DeltaEnum8Bit netr_DeltaEnum")
 cpp_quote("#define netr_SamDatabaseID8Bit netr_SamDatabaseID")
+
+cpp_quote("#define ENC_CRC32 KERB_ENCTYPE_DES_CBC_CRC")
+cpp_quote("#define ENC_RSA_MD5 KERB_ENCTYPE_DES_CBC_MD5")
+cpp_quote("#define ENC_RC4_HMAC_MD5 KERB_ENCTYPE_RC4_HMAC_MD5")
+cpp_quote("#define ENC_HMAC_SHA1_96_AES128 KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96")
+cpp_quote("#define ENC_HMAC_SHA1_96_AES256 KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96")
 
 [
@@ -208 +214 @@
 
         typedef struct {
-                NTTIME last_logon;
-                NTTIME last_logoff;
-                NTTIME acct_expiry;
+                NTTIME logon_time;
+                NTTIME logoff_time;
+                NTTIME kickoff_time;
                 NTTIME last_password_change;
                 NTTIME allow_password_change;
@@ -228 +234 @@
                 netr_UserSessionKey key;
                 lsa_StringLarge logon_server;
-                lsa_StringLarge domain;
+                lsa_StringLarge logon_domain;
                 dom_sid2 *domain_sid;
                 netr_LMSessionKey LMSessKey;
                 samr_AcctFlags acct_flags;
-                uint32 unknown[7];
+                uint32 sub_auth_status;
+                NTTIME last_successful_logon;
+                NTTIME last_failed_logon;
+                uint32 failed_logon_count;
+                uint32 reserved;
         } netr_SamBaseInfo;
 
@@ -862 +872 @@
         } netr_NETLOGON_INFO_4;
 
-        typedef union {
+        typedef [public] union {
                 [case(1)]  netr_NETLOGON_INFO_1 *info1;
                 [case(2)]  netr_NETLOGON_INFO_2 *info2;
@@ -871 +881 @@
 
         /* function_code values */
-        typedef [v1_enum] enum {
+        typedef [v1_enum,public] enum {
                 NETLOGON_CONTROL_QUERY                  = 0x00000001,
                 NETLOGON_CONTROL_REPLICATE              = 0x00000002,
@@ -911 +921 @@
         /* Function 0x0E */
 
-        typedef union {
+        typedef [public,switch_type(netr_LogonControlCode)] union {
                 [case(NETLOGON_CONTROL_REDISCOVER)]        [string,charset(UTF16)] uint16 *domain;
                 [case(NETLOGON_CONTROL_TC_QUERY)]          [string,charset(UTF16)] uint16 *domain;
@@ -1146 +1156 @@
                 DS_SERVER_SELECT_SECRET_DOMAIN_6 = 0x00000800,
                 DS_SERVER_FULL_SECRET_DOMAIN_6   = 0x00001000,
+                DS_SERVER_WEBSERV                = 0x00002000,
+                DS_SERVER_DS_8                   = 0x00004000,
                 DS_DNS_CONTROLLER                = 0x20000000,
                 DS_DNS_DOMAIN                    = 0x40000000,
@@ -1331 +1343 @@
                 lsa_String dummy_string4;
                 netr_WorkstationFlags workstation_flags;
-                uint32 dummy_long2;
+                kerb_EncTypes supported_enc_types;
                 uint32 dummy_long3;
                 uint32 dummy_long4;
@@ -1376 +1388 @@
         } netr_OneDomainInfo;
 
-        typedef [public,bitmap32bit] bitmap {
-                ENC_CRC32 = 0x00000001,
-                ENC_RSA_MD5 = 0x00000002,
-                ENC_RC4_HMAC_MD5 = 0x00000004,
-                ENC_HMAC_SHA1_96_AES128  = 0x00000008,
-                ENC_HMAC_SHA1_96_AES256  = 0x00000010
-        } netr_SupportedEncTypes;
-
         typedef struct {
                 netr_OneDomainInfo primary_domain;
@@ -1394 +1398 @@
                 lsa_StringLarge dummy_string4;
                 netr_WorkstationFlags workstation_flags;
-                netr_SupportedEncTypes supported_enc_types;
+                kerb_EncTypes supported_enc_types;
                 uint32 dummy_long3;
                 uint32 dummy_long4;
@@ -1445 +1449 @@
         /****************/
         /* Function 0x1f */
-        WERROR netr_ServerPasswordGet(
+        NTSTATUS netr_ServerPasswordGet(
                 [in,unique] [string,charset(UTF16)] uint16 *server_name,
                 [in]  [string,charset(UTF16)] uint16 *account_name,
@@ -1498 +1502 @@
         /* Function 0x24 */
 
-        typedef [v1_enum] enum {
-                NETR_TRUST_TYPE_DOWNLEVEL       = 1,
-                NETR_TRUST_TYPE_UPLEVEL         = 2,
-                NETR_TRUST_TYPE_MIT             = 3,
-                NETR_TRUST_TYPE_DCE             = 4
-        } netr_TrustType;
-
-        typedef [bitmap32bit] bitmap {
-                NETR_TRUST_ATTRIBUTE_NON_TRANSITIVE     = 0x00000001,
-                NETR_TRUST_ATTRIBUTE_UPLEVEL_ONLY       = 0x00000002,
-                NETR_TRUST_ATTRIBUTE_QUARANTINED_DOMAIN = 0x00000004,
-                NETR_TRUST_ATTRIBUTE_FOREST_TRANSITIVE  = 0x00000008,
-                NETR_TRUST_ATTRIBUTE_CROSS_ORGANIZATION = 0x00000010,
-                NETR_TRUST_ATTRIBUTE_WITHIN_FOREST      = 0x00000020,
-                NETR_TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL  = 0x00000040
-        } netr_TrustAttributes;
-
         typedef struct {
                 [string,charset(UTF16)] uint16                  *netbios_name;
@@ -1520 +1507 @@
                 netr_TrustFlags         trust_flags;
                 uint32                  parent_index;
-                netr_TrustType          trust_type;
-                netr_TrustAttributes    trust_attributes;
+                lsa_TrustType           trust_type;
+                lsa_TrustAttributes     trust_attributes;
                 dom_sid2                *sid;
                 GUID                    guid;
@@ -1606 +1593 @@
                 [in,ref] netr_Authenticator *credential,
                 [out,ref] netr_Authenticator *return_authenticator,
-                [out,ref] samr_Password *password,
-                [out,ref] samr_Password *password2
+                [out,ref] samr_Password *new_owf_password,
+                [out,ref] samr_Password *old_owf_password
         );
 

vendor/current/librpc/idl/ntlmssp.idl

@@ -1 +1 @@
 #include "idl_types.h"
+
+import "security.idl";
 
 /*
@@ -55 +57 @@
         /*
            NTLMSSP_WINDOWS_MAJOR_VERSION_5: Windows XP SP2 and Server 2003
-           NTLMSSP_WINDOWS_MAJOR_VERSION_6: Windows Vista, Server 2008, 7 and Server 2008 R2
+           NTLMSSP_WINDOWS_MAJOR_VERSION_6: Windows Vista, Server 2008, 7, Server 2008 R2, 8, Server 2012, 8.1, Server 2012 R2
+           NTLMSSP_WINDOWS_MAJOR_VERSION_10: Windows 10, Windows Server 2016 Technical Preview
          */
 
         typedef [enum8bit] enum {
                 NTLMSSP_WINDOWS_MAJOR_VERSION_5 = 0x05,
-                NTLMSSP_WINDOWS_MAJOR_VERSION_6 = 0x06
+                NTLMSSP_WINDOWS_MAJOR_VERSION_6 = 0x06,
+                NTLMSSP_WINDOWS_MAJOR_VERSION_10 = 0x0A
         } ntlmssp_WindowsMajorVersion;
 
         /*
-           NTLMSSP_WINDOWS_MINOR_VERSION_0: Windows Vista, Server 2008, 7, Server 2008 R2
-           NTLMSSP_WINDOWS_MINOR_VERSION_1: Windows XP SP2
-           NTLMSSP_WINDOWS_MINOR_VERSION_2: Windows Server 2003
+           NTLMSSP_WINDOWS_MINOR_VERSION_0: Windows Vista, 10, Server 2016 Technical Preview
+           NTLMSSP_WINDOWS_MINOR_VERSION_1: Windows XP SP2, 7, Server 2008 R2
+           NTLMSSP_WINDOWS_MINOR_VERSION_2: Windows Server 2003, 8, Server 2012
+           NTLMSSP_WINDOWS_MINOR_VERSION_3: Windows 8.1, Server 2012 R2
          */
 
@@ -72 +77 @@
                 NTLMSSP_WINDOWS_MINOR_VERSION_0 = 0x00,
                 NTLMSSP_WINDOWS_MINOR_VERSION_1 = 0x01,
-                NTLMSSP_WINDOWS_MINOR_VERSION_2 = 0x02
+                NTLMSSP_WINDOWS_MINOR_VERSION_2 = 0x02,
+                NTLMSSP_WINDOWS_MINOR_VERSION_3 = 0x03
         } ntlmssp_WindowsMinorVersion;
 
@@ -124 +130 @@
                 MsvAvFlags              = 6,
                 MsvAvTimestamp          = 7,
-                MsAvRestrictions        = 8,
+                MsvAvSingleHost         = 8,
                 MsvAvTargetName         = 9,
                 MsvChannelBindings      = 10
         } ntlmssp_AvId;
 
-        /* [MS-NLMP] 2.2.2.2 Restriction_Encoding */
-
-        typedef struct {
-                uint32 Size;
+        /* [MS-NLMP] 2.2.2.2 SingleHostData */
+
+        typedef [flag(NDR_PAHEX)] struct {
+                [value(8+ndr_size_LSAP_TOKEN_INFO_INTEGRITY(&r->token_info, 0)+r->remaining.length)] uint32 Size;
                 [value(0)] uint32 Z4;
-                boolean32 IntegrityLevel;
-                uint32 SubjectIntegrityLevel;
-                uint8 MachineId[32];
-        } Restriction_Encoding;
+                LSAP_TOKEN_INFO_INTEGRITY token_info;
+                [flag(NDR_REMAINING)] DATA_BLOB remaining;
+        } ntlmssp_SingleHostData;
 
         typedef [bitmap32bit] bitmap {
                 NTLMSSP_AVFLAG_CONSTRAINTED_ACCOUNT             = 0x00000001,
-                NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE      = 0x00000002
+                NTLMSSP_AVFLAG_MIC_IN_AUTHENTICATE_MESSAGE      = 0x00000002,
+                NTLMSSP_AVFLAG_TARGET_SPN_FROM_UNTRUSTED_SOURCE = 0x00000004
         } ntlmssp_AvFlags;
 
@@ -153 +159 @@
                 [case(MsvAvFlags)]              ntlmssp_AvFlags AvFlags;
                 [case(MsvAvTimestamp)]          NTTIME AvTimestamp;
-                [case(MsAvRestrictions)]        Restriction_Encoding AvRestrictions;
+                [case(MsvAvSingleHost)]         ntlmssp_SingleHostData AvSingleHost;
                 [case(MsvAvTargetName)]         [flag(ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_UNICODE))] string AvTargetName;
                 [case(MsvChannelBindings)]      uint8 ChannelBindings[16];
@@ -167 +173 @@
         } AV_PAIR;
 
-        typedef [gensize,nopush,nopull,flag(NDR_NOALIGN)] struct {
+        typedef [public,gensize,nopush,nopull,flag(NDR_NOALIGN)] struct {
                 uint32 count;
                 AV_PAIR pair[count];
@@ -184 +190 @@
                 uint8 Reserved[8];
                 [value(ndr_size_AV_PAIR_LIST(TargetInfo, ndr->flags))] uint16 TargetInfoLen;
-                [value(TargetInfoLen)] uint16 TargetNameInfoMaxLen;
+                [value(TargetInfoLen)] uint16 TargetInfoMaxLen;
                 [relative] [subcontext(0),subcontext_size(TargetInfoLen)] AV_PAIR_LIST *TargetInfo;
                 [switch_is(NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_Version Version;
@@ -239 +245 @@
         } ntlmssp_NTLM_RESPONSE;
 
+        const int NTLMSSP_MIC_OFFSET = 72;
+        const int NTLMSSP_MIC_SIZE = 16;
+
         typedef [flag(NDR_PAHEX)] struct {
-                uint8 MIC[16];
-        } MIC;
+                uint8 MIC[NTLMSSP_MIC_SIZE];
+        } ntlmssp_MIC;
 
         /* [MS-NLMP] 2.2.1.3 AUTHENTICATE_MESSAGE */
@@ -270 +279 @@
                 /* MIC (Message Integrity) is only included when the client has
                  * sent a timestap Av struct in the CHALLENGE_MESSAGE AvPair */
-                /* [flag(NDR_REMAINING)] MIC mic; */
+                /* [flag(NDR_REMAINING)] ntlmssp_MIC mic; */
         } AUTHENTICATE_MESSAGE;
 

vendor/current/librpc/idl/orpc.idl

@@ -42 +42 @@
 
 
-        typedef [public] struct 
+        typedef [public] struct
         {
                 uint16 MajorVersion; /* Major version number */
@@ -59 +59 @@
 
         /* Extension to implicit parameters. */
-        typedef [public] struct 
-        {       
+        typedef [public] struct
+        {
                 GUID id; /* Extension identifier. */
                 uint32 size; /* Extension size. */
@@ -68 +68 @@
 
         /* Array of extensions. */
-        typedef struct 
+        typedef struct
         {
                 uint32 size; /* Num extents. */
@@ -78 +78 @@
         /* implicit 'this' pointer which is the first [in] parameter on */
         /* every ORPC call. */
-        typedef [public] struct 
+        typedef [public] struct
         {
                 COMVERSION version; /* COM version number */
@@ -91 +91 @@
         /* implicit 'that' pointer which is the first [out] parameter on */
         /* every ORPC call. */
-        typedef [public] struct 
+        typedef [public] struct
         {
                 uint32 flags; /* ORPCF flags for presence of other data */
@@ -101 +101 @@
         /* DUALSTRINGARRAYS are the return type for arrays of network addresses, */
         /* arrays of endpoints and arrays of both used in many ORPC interfaces */
-        typedef [public,flag(NDR_NOALIGN)] struct 
+        typedef [public,flag(NDR_NOALIGN)] struct
         {
                 uint16 wTowerId; /* Cannot be zero. */
-                nstring NetworkAddr; 
+                nstring NetworkAddr;
         }       STRINGBINDING;
 
-        typedef [public,nopush,nopull,noprint] struct 
+        typedef [public,nopush,nopull,noprint] struct
         {
                 STRINGBINDING **stringbindings;
         } STRINGARRAY;
 
-        typedef [public,nopush,nopull,noprint] struct 
+        typedef [public,nopush,nopull,noprint] struct
         {
                 STRINGBINDING **stringbindings;
@@ -119 +119 @@
 
         const uint16 COM_C_AUTHZ_NONE = 0xffff;
-        typedef [public,flag(NDR_NOALIGN)] struct 
+        typedef [public,flag(NDR_NOALIGN)] struct
         {
                 uint16 wAuthnSvc; /* Cannot be zero. */
                 uint16 wAuthzSvc;
-                nstring PrincName; 
+                nstring PrincName;
         }       SECURITYBINDING;
 
         /* signature value for OBJREF (object reference, actually the */
-        /* marshaled form of a COM interface). 
+        /* marshaled form of a COM interface).
          * MEOW apparently stands for "Microsoft Extended Object Wireformat"
          */
@@ -157 +157 @@
 
         /* standard object reference */
-        typedef [public] struct 
+        typedef [public] struct
         {
                 uint32 flags; /* STDOBJREF flags (see above) */
@@ -191 +191 @@
         } u_null;
 
-        typedef [nodiscriminant] union 
+        typedef [nodiscriminant] union
         {
                 [case(OBJREF_NULL)] u_null u_null;
@@ -200 +200 @@
 
         /* OBJREF is the format of a marshaled interface pointer. */
-        typedef [public,flag(NDR_LITTLE_ENDIAN)] struct 
+        typedef [public,flag(NDR_LITTLE_ENDIAN)] struct
         {
                 uint32 signature;
@@ -209 +209 @@
 
         /* wire representation of a marshalled interface pointer */
-        typedef [public] struct 
+        typedef [public] struct
         {
                 uint32 size;
@@ -215 +215 @@
         } MInterfacePointer;
 
-        typedef [v1_enum,public] enum 
+        typedef [v1_enum,public] enum
         {
                 COM_OK                          = 0x00000000,

vendor/current/librpc/idl/oxidresolver.idl

@@ -4 +4 @@
  */
 
-/* 
- The OXID Resolver can turn a OXID (Object Exporter ID) into a 
+/*
+ The OXID Resolver can turn a OXID (Object Exporter ID) into a
  RPC binding string that can be used to contact an object
 
@@ -13 +13 @@
 import "misc.idl", "orpc.idl";
 
-[ 
+[
         uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"),
         helpstring("Object Exporter ID Resolver"),
@@ -30 +30 @@
 
         [idempotent] WERROR ResolveOxid (
-                 [in] OXID pOxid,
-                 [in] uint16 cRequestedProtseqs,
-                 [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-                 [out] DUALSTRINGARRAY **ppdsaOxidBindings,
-                 [out,ref] IPID *pipidRemUnknown,
-                 [out,ref] uint32 *pAuthnHint
-                         );
+                [in] OXID pOxid,
+                [in] uint16 cRequestedProtseqs,
+                [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
+                [out] DUALSTRINGARRAY **ppdsaOxidBindings,
+                [out,ref] IPID *pipidRemUnknown,
+                [out,ref] uint32 *pAuthnHint
+                );
 
         /* Simple ping is used to ping a Set. Client machines use this */
@@ -46 +46 @@
                 [in] SETID *SetId /* Must not be zero */
                 );
-        
+
         /* Complex ping is used to create sets of OIDs to ping. The */
         /* whole set can subsequently be pinged using SimplePing, */
@@ -60 +60 @@
                 [in, size_is(cDelFromSet)] OID DelFromSet[],
                 [out,ref] uint16 *PingBackoffFactor/* 2^factor = multipler */
-                         );
+                 );
 
         /* In some cases the client maybe unsure that a particular */
@@ -72 +72 @@
         /* RemoteUnknown IPID and COM version for an object server */
         /* given its OXID. Supported by DCOM */
-        /* version 5.2 and above. Looks like that means 
+        /* version 5.2 and above. Looks like that means
          * Windows 2003/XP and above */
         [idempotent] WERROR ResolveOxid2 (
-                                                                                          [in] OXID pOxid,
-                                                                                          [in] uint16 cRequestedProtseqs,
-                                                                                          [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
-                                                                                          [out] DUALSTRINGARRAY **pdsaOxidBindings,
-                                                                                          [out,ref] IPID *ipidRemUnknown,
-                                                                                          [out,ref] uint32 *AuthnHint,
-                                                                                          [out,ref] COMVERSION *ComVersion
-                                                                                         );
+                [in] OXID pOxid,
+                [in] uint16 cRequestedProtseqs,
+                [in, size_is(cRequestedProtseqs)] uint16 arRequestedProtseqs[],
+                [out] DUALSTRINGARRAY **pdsaOxidBindings,
+                [out,ref] IPID *ipidRemUnknown,
+                [out,ref] uint32 *AuthnHint,
+                [out,ref] COMVERSION *ComVersion
+                );
+
         typedef struct {
                 COMVERSION version;
@@ -89 +90 @@
 
         [idempotent] WERROR ServerAlive2 (
-          [out,ref] COMINFO *info,
-          [out,ref] DUALSTRINGARRAY *dualstring,
-          [out,ref] uint8 *unknown2,
-          [out,ref] uint8 *unknown3,
-          [out,ref] uint8 *unknown4);
+                [out,ref] COMINFO *info,
+                [out,ref] DUALSTRINGARRAY **dualstring,
+                [out,ref] uint8 *pReserved
+                );
 }

vendor/current/librpc/idl/preg.idl

@@ -18 +18 @@
         interface preg
 {
-        typedef [public] struct {
+        typedef [public,flag(NDR_PAHEX)] struct {
                 [charset(DOS),value("["),noprint] uint8 _opening_bracket[2];
                 nstring keyname;

vendor/current/librpc/idl/remact.idl

@@ -13 +13 @@
 interface IRemoteActivation
 {
-        typedef enum 
-        {
+        typedef [v1_enum] enum {
                 RPC_C_IMP_LEVEL_DEFAULT = 0,
                 RPC_C_IMP_LEVEL_ANONYMOUS = 1,
@@ -23 +22 @@
 
         const uint32 MODE_GET_CLASS_OBJECT = 0xffffffff;
+
         WERROR RemoteActivation (
-                        [in] ORPCTHIS this_object,
-                        [out,ref] ORPCTHAT *that,
-                        [in] GUID Clsid,
-                        [in] [string,charset(UTF16)] uint16 *pwszObjectName,
-                        [in] MInterfacePointer *pObjectStorage,
-                        [in] uint32 ClientImpLevel,
-                        [in] uint32 Mode,
-                        [in,range(1,32768)] uint32 Interfaces,
-                        [in,size_is(Interfaces)] GUID *pIIDs,
-                        [in] uint16 num_protseqs,
-                        [in, size_is(num_protseqs)] uint16 protseq[*],
-                        [out,ref] hyper *pOxid,
-                        [out,ref] DUALSTRINGARRAY *pdsaOxidBindings,
-                        [out,ref] GUID *ipidRemUnknown,
-                        [out,ref] uint32 *AuthnHint,
-                        [out,ref] COMVERSION *ServerVersion,
-                        [out,ref] WERROR *hr,
-                        [out,size_is(Interfaces)] MInterfacePointer *ifaces[],
-                        [out,size_is(Interfaces)] WERROR results[]
-                        );
+                [in] ORPCTHIS this_object,
+                [out,ref] ORPCTHAT *that,
+                [in] GUID Clsid,
+                [in] [unique,string,charset(UTF16)] uint16 *pwszObjectName,
+                [in] [unique] MInterfacePointer *pObjectStorage,
+                [in] imp_levels ClientImpLevel,
+                [in] uint32 Mode,
+                [in,range(1,32768)] uint32 Interfaces,
+                [in,unique,size_is(Interfaces)] GUID *pIIDs,
+                [in] uint16 num_protseqs,
+                [in, size_is(num_protseqs)] uint16 protseq[*],
+                [out,ref] hyper *pOxid,
+                [out,ref] DUALSTRINGARRAY **pdsaOxidBindings,
+                [out,ref] GUID *ipidRemUnknown,
+                [out,ref] uint32 *AuthnHint,
+                [out,ref] COMVERSION *ServerVersion,
+                [out,ref] HRESULT *hr,
+                [out,size_is(Interfaces)] MInterfacePointer **ifaces,
+                [out,size_is(Interfaces)] HRESULT results[]
+                );
 }

vendor/current/librpc/idl/rot.idl

@@ -4 +4 @@
         uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
         version(0.2),
-        pointer_default(unique),
-        endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
-                  "ncalrpc:[EPMAPPER]")
+        pointer_default(unique),
+        endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]",
+                 "ncalrpc:[EPMAPPER]")
 ] interface rot
 {
         WERROR rot_add (
-                                        [in] uint32 flags, 
-                                        [in] MInterfacePointer *unk, 
-                                        [in] MInterfacePointer *moniker, 
-                                        [out] uint32 *rotid
-                                        );
-        
+                [in] uint32 flags,
+                [in] MInterfacePointer *unk,
+                [in] MInterfacePointer *moniker,
+                [out] uint32 *rotid
+                );
+
         WERROR rot_remove (
-                                  [in] uint32 rotid
-                                  );
-        
+                [in] uint32 rotid
+                );
+
         WERROR rot_is_listed (
-                                         [in] MInterfacePointer *moniker
-                                         );
-        
+                [in] MInterfacePointer *moniker
+                );
+
         WERROR rot_get_interface_pointer (
-                                         [in] MInterfacePointer *moniker, 
-                                         [out] MInterfacePointer *ip
-                                         );
-        
+                [in] MInterfacePointer *moniker,
+                [out] MInterfacePointer *ip
+                );
+
         WERROR rot_set_modification_time (
-                                                  [in] uint32 rotid, 
-                                                  [in] NTTIME *t
-                                                  );
-        
+                [in] uint32 rotid,
+                [in] NTTIME *t
+                );
+
         WERROR rot_get_modification_time (
-                                                           [in] MInterfacePointer *moniker,
-                                                           [out] NTTIME *t
-                                                           );
-        
+                [in] MInterfacePointer *moniker,
+                [out] NTTIME *t
+                );
+
         WERROR rot_enum (
-                                           [out] MInterfacePointer *EnumMoniker
-                                           );
+                [out] MInterfacePointer *EnumMoniker
+                );
 }

vendor/current/librpc/idl/samr.idl

@@ -17 +17 @@
 {
         typedef bitmap security_secinfo security_secinfo;
-
-        /* SAM database types */
-        typedef [public,v1_enum] enum {
-                SAM_DATABASE_DOMAIN  = 0, /* Domain users and groups */
-                SAM_DATABASE_BUILTIN = 1, /* BUILTIN users and groups */
-                SAM_DATABASE_PRIVS   = 2 /* Privileges */
-        } netr_SamDatabaseID;
 
         /* account control (acct_flags) bits */

vendor/current/librpc/idl/schannel.idl

@@ -5 +5 @@
 */
 
-import "netlogon.idl", "nbt.idl";
+import "netlogon.idl", "nbt.idl", "misc.idl", "security.idl";
 
 [
         pointer_default(unique),
-        helper("../librpc/ndr/ndr_schannel.h")
+        helper("../librpc/ndr/ndr_schannel.h", "../librpc/ndr/ndr_nbt.h")
 ]
 interface schannel

vendor/current/librpc/idl/security.idl

@@ -27 +27 @@
 
 [
+        /*
+         * cbf7d408-2d6c-11e2-ae5b-0b5692790e18 just to make ndrdump happy
+         */
+        uuid("cbf7d408-2d6c-11e2-ae5b-0b5692790e18"),
+        version(0.0),
         pyhelper("librpc/ndr/py_security.c"),
         pointer_default(unique)
@@ -148 +153 @@
 
         /* rights granted by some specific privileges */
-        const int SEC_RIGHTS_PRIV_BACKUP  = SEC_STD_READ_CONTROL | 
+        const int SEC_RIGHTS_PRIV_BACKUP  = SEC_STD_READ_CONTROL |
                                             SEC_FLAG_SYSTEM_SECURITY |
-                                            SEC_GENERIC_READ;
-        const int SEC_RIGHTS_DIR_PRIV_BACKUP  = SEC_RIGHTS_PRIV_BACKUP 
-                                              | SEC_DIR_TRAVERSE;
-
-        const int SEC_RIGHTS_PRIV_RESTORE = SEC_STD_WRITE_DAC | 
+                                            SEC_RIGHTS_FILE_READ |
+                                            SEC_DIR_TRAVERSE;
+
+        const int SEC_RIGHTS_PRIV_RESTORE = SEC_STD_WRITE_DAC |
                                             SEC_STD_WRITE_OWNER |
                                             SEC_FLAG_SYSTEM_SECURITY |
+                                            SEC_RIGHTS_FILE_WRITE |
+                                            SEC_DIR_ADD_FILE |
+                                            SEC_DIR_ADD_SUBDIR |
                                             SEC_STD_DELETE;
-        const int SEC_RIGHTS_DIR_PRIV_RESTORE = SEC_RIGHTS_PRIV_RESTORE | 
-                                            SEC_DIR_ADD_FILE |
-                                            SEC_DIR_ADD_SUBDIR;
 
         /* combinations of standard masks. */
@@ -270 +274 @@
         const string SID_BUILTIN_AUTH_ACCESS            = "S-1-5-32-560";
         const string SID_BUILTIN_TS_LICENSE_SERVERS     = "S-1-5-32-561";
+        const string SID_BUILTIN_DISTRIBUTED_COM_USERS  = "S-1-5-32-562";
+        const string SID_BUILTIN_CRYPTO_OPERATORS       = "S-1-5-32-569";
+        const string SID_BUILTIN_EVENT_LOG_READERS      = "S-1-5-32-573";
+        const string SID_BUILTIN_CERT_SERV_DCOM_ACCESS  = "S-1-5-32-574";
 
         /* SECURITY_NT_SERVICE */
@@ -277 +285 @@
         const string SID_NT_TRUSTED_INSTALLER =
                 "S-1-5-80-956008885-3418522649-1831038044-1853292631-2271478464";
+
+        const string SID_AUTHENTICATION_AUTHORITY_ASSERTED_IDENTITY = "S-1-18-1";
+        const string SID_SERVICE_ASSERTED_IDENTITY = "S-1-18-2";
 
         /* well-known domain RIDs */
@@ -317 +328 @@
         const int BUILTIN_RID_AUTH_ACCESS               = 560;
         const int BUILTIN_RID_TS_LICENSE_SERVERS        = 561;
+        const int BUILTIN_RID_DISTRIBUTED_COM_USERS     = 562;
+        const int BUILTIN_RID_CRYPTO_OPERATORS          = 569;
+        const int BUILTIN_RID_EVENT_LOG_READERS         = 573;
+        const int BUILTIN_RID_CERT_SERV_DCOM_ACCESS     = 574;
 
 /********************************************************************
@@ -525 +540 @@
                 security_acl_revision revision;
                 [value(ndr_size_security_acl(r,ndr->flags))] uint16 size;
-                [range(0,1000)] uint32 num_aces;
+                [range(0,2000)] uint32 num_aces;
                 security_ace aces[num_aces];
         } security_acl;
@@ -565 +580 @@
         } security_descriptor;
 
+        [nopython] void decode_security_descriptor (
+                [in] security_descriptor sd
+                );
+
         typedef [public] struct {
                 [range(0,0x40000),value(ndr_size_security_descriptor(sd,ndr->flags))] uint32 sd_size;
@@ -570 +589 @@
         } sec_desc_buf;
 
+        [nopython] void decode_sec_desc_buf (
+                [in] sec_desc_buf sd_buf
+                );
+
         /* This is not yet sent over the network, but is simply defined in IDL */
-        typedef [public,gensize] struct {
+        typedef [public] struct {
                 uint32 num_sids;
                 [size_is(num_sids)] dom_sid sids[*];
@@ -578 +601 @@
         } security_token;
 
+        [nopython] void decode_security_token (
+                [in] security_token token
+                );
+
         /* This is not yet sent over the network, but is simply defined in IDL */
-        typedef [public,gensize] struct {
+        typedef [public] struct {
                 uid_t uid;
-                uid_t gid;
+                gid_t gid;
                 uint32 ngroups;
                 [size_is(ngroups)] gid_t groups[*];
         } security_unix_token;
+
+        [nopython] void decode_security_unix_token (
+                [in] security_unix_token unix_token
+                );
 
         /* bits that determine which parts of a security descriptor
@@ -603 +634 @@
         } security_secinfo;
 
+        /*
+         * a SMB server should only support the following flags
+         * and ignore all others.
+         *
+         * See AdditionalInformation in [MS-SMB2] 2.2.37 SMB2 QUERY_INFO Request
+         * and 2.2.39 SMB2 SET_INFO Request.
+         */
+        const int SMB_SUPPORTED_SECINFO_FLAGS = (
+                SECINFO_OWNER           |
+                SECINFO_GROUP           |
+                SECINFO_DACL            |
+                SECINFO_SACL            |
+                SECINFO_LABEL           |
+                SECINFO_ATTRIBUTE       |
+                SECINFO_SCOPE           |
+                SECINFO_BACKUP          |
+                0);
+
+        /*
+         * See [MS-KILE] 2.2.5 LSAP_TOKEN_INFO_INTEGRITY
+         */
+        typedef [public,gensize,flag(NDR_PAHEX)] struct {
+                uint32 Flags;
+                uint32 TokenIL;
+                uint8 MachineId[32];
+        } LSAP_TOKEN_INFO_INTEGRITY;
+
+        /*
+         * See [MS-KILE] 2.2.6 Supported Encryption Types Bit Flags
+         */
         typedef [public,bitmap32bit] bitmap {
                 KERB_ENCTYPE_DES_CBC_CRC             = 0x00000001,
@@ -608 +669 @@
                 KERB_ENCTYPE_RC4_HMAC_MD5            = 0x00000004,
                 KERB_ENCTYPE_AES128_CTS_HMAC_SHA1_96 = 0x00000008,
-                KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96 = 0x00000010
+                KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96 = 0x00000010,
+                KERB_ENCTYPE_FAST_SUPPORTED          = 0x00010000,
+                KERB_ENCTYPE_COMPOUND_IDENTITY_SUPPORTED = 0x00020000,
+                KERB_ENCTYPE_CLAIMS_SUPPORTED        = 0x00040000,
+                KERB_ENCTYPE_RESOURCE_SID_COMPRESSION_DISABLED = 0x00080000
         } kerb_EncTypes;
 
@@ -629 +694 @@
         const string GUID_DRS_CHANGE_SCHEMA_MASTER    = "e12b56b6-0a95-11d1-adbb-00c04fd8d5cd";
         const string GUID_DRS_GET_CHANGES             = "1131f6aa-9c07-11d1-f79f-00c04fc2dcd2";
+        const string GUID_DRS_REPL_SYNCRONIZE         = "1131f6ab-9c07-11d1-f79f-00c04fc2dcd2";
+        const string GUID_DRS_MANAGE_TOPOLOGY         = "1131f6ac-9c07-11d1-f79f-00c04fc2dcd2";
         const string GUID_DRS_GET_ALL_CHANGES         = "1131f6ad-9c07-11d1-f79f-00c04fc2dcd2";
+        const string GUID_DRS_RO_REPL_SECRET_SYNC     = "1131f6ae-9c07-11d1-f79f-00c04fc2dcd2";
         const string GUID_DRS_GET_FILTERED_ATTRIBUTES = "89e95b76-444d-4c62-991a-0facbeda640c";
-        const string GUID_DRS_MANAGE_TOPOLOGY         = "1131f6ac-9c07-11d1-f79f-00c04fc2dcd2";
         const string GUID_DRS_MONITOR_TOPOLOGY        = "f98340fb-7c5b-4cdb-a00b-2ebdfa115a96";
-        const string GUID_DRS_REPL_SYNCRONIZE         = "1131f6ab-9c07-11d1-f79f-00c04fc2dcd2";
-        const string GUID_DRS_RO_REPL_SECRET_SYNC     = "1131f6ae-9c07-11d1-f79f-00c04fc2dcd2";
         const string GUID_DRS_USER_CHANGE_PASSWORD    = "ab721a53-1e2f-11d0-9819-00aa0040529b";
         const string GUID_DRS_FORCE_CHANGE_PASSWORD   = "00299570-246d-11d0-a768-00aa006e0529";
+        const string GUID_DRS_UPDATE_PASSWORD_NOT_REQUIRED_BIT
+                                                      = "280f369c-67c7-438e-ae98-1d46f3c6f541";
+        const string GUID_DRS_UNEXPIRE_PASSWORD       = "ccc2dc7d-a6ad-4a7a-8846-c04e3cc53501";
+        const string GUID_DRS_ENABLE_PER_USER_REVERSIBLY_ENCRYPTED_PASSWORD
+                                                      = "05c74c5e-4deb-43b4-bd9f-86664c2a7fd5";
+        const string GUID_DRS_DS_INSTALL_REPLICA      = "9923a32a-3607-11d2-b9be-0000f87a36b2";
+        const string GUID_DRS_REANIMATE_TOMBSTONE     = "45ec5156-db7e-47bb-b53f-dbeb2d03c40f";
+
 
         /***************************************************************/

vendor/current/librpc/idl/spoolss.idl

@@ -29 +29 @@
         } spoolss_Time;
 
-        typedef struct {
+        typedef [public] struct {
                 [value(ndr_size_spoolss_Time(time, ndr->flags))] uint32 size;
                 [unique] spoolss_Time *time;
@@ -36 +36 @@
         typedef enum {
                 PROCESSOR_ARCHITECTURE_INTEL            = 0x0000,
+                PROCESSOR_ARCHITECTURE_ARM              = 0x0005,
                 PROCESSOR_ARCHITECTURE_IA64             = 0x0006,
                 PROCESSOR_ARCHITECTURE_AMD64            = 0x0009
@@ -41 +42 @@
 
         typedef [v1_enum] enum {
+                PROCESSOR_ARM                           = 0x00000000,
                 PROCESSOR_INTEL_386                     = 0x00000182,
                 PROCESSOR_INTEL_486                     = 0x000001E6,
@@ -426 +428 @@
                 [value(SPOOLSS_DM_SIGNATURE_JTEXP)] spoolss_DM_Signature dwSignature;
                 [value(0)] uint32 dwVersion;
-                [value(16)] uint32 wJTHdrSize;
-                uint32 wCoreMFOSize;
-                [string,charset(UTF16)] uint16 *ModelName;
-                nstring_array FeatureOptionPairs;
+                [value(16)] uint16 wJTHdrSize;
+                uint16 wCoreMFOSize; /* must be sizeof the two following elements, must be dwSize - 16*/
+                nstring ModelName;
+                [flag(STR_UTF8|STR_NULLTERM|NDR_REMAINING)] string_array FeatureOptionPairs;
         } spoolss_JTEXP;
 
@@ -884 +886 @@
         /******************/
         /* Function: 0x01 */
-        typedef struct {
+        typedef [public] struct {
                 [value(_ndr_size_spoolss_DeviceMode(devmode, ndr->flags))] uint32 _ndr_size;
                 [subcontext(4),subcontext_size(_ndr_size)] spoolss_DeviceMode *devmode;
@@ -1010 +1012 @@
                 [string,charset(UTF16)] uint16 *parameters;
                 [string,charset(UTF16)] uint16 *driver_name;
-                uint32 _devmode_ptr; /* pointer to truncated devicemode */
+                uint32 *_devmode_ptr; /* pointer to truncated devicemode */
                 [string,charset(UTF16)] uint16 *text_status;
-                uint32 _secdesc_ptr;
+                uint32 *_secdesc_ptr;
                 spoolss_JobStatus status;
                 [range(0,99)] uint32 priority;
@@ -1036 +1038 @@
                 [string,charset(UTF16)] uint16 *parameters;
                 [string,charset(UTF16)] uint16 *driver_name;
-                uint32 _devmode_ptr; /* pointer to truncated devicemode */
+                uint32 *_devmode_ptr; /* pointer to truncated devicemode */
                 [string,charset(UTF16)] uint16 *text_status;
-                uint32 _secdesc_ptr;
+                uint32 *_secdesc_ptr;
                 spoolss_JobStatus status;
                 [range(0,99)] uint32 priority;
@@ -1052 +1054 @@
         } spoolss_SetJobInfo4;
 
-        typedef [public] union {
+        typedef [ms_union,public] union {
                 [case(1)] spoolss_SetJobInfo1 *info1;
                 [case(2)] spoolss_SetJobInfo2 *info2;
@@ -1060 +1062 @@
         } spoolss_SetJobInfo;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 level;
                 [switch_is(level)] spoolss_SetJobInfo info;
@@ -1066 +1068 @@
 
         typedef [v1_enum] enum {
+                SPOOLSS_JOB_CONTROL_NOOP                = 0,
                 SPOOLSS_JOB_CONTROL_PAUSE               = 1,
                 SPOOLSS_JOB_CONTROL_RESUME              = 2,
@@ -1199 +1202 @@
                 [string,charset(UTF16)] uint16 *comment;
                 [string,charset(UTF16)] uint16 *location;
-                uint32 devmode_ptr;
+                uint32 *devmode_ptr;
                 [string,charset(UTF16)] uint16 *sepfile;
                 [string,charset(UTF16)] uint16 *printprocessor;
                 [string,charset(UTF16)] uint16 *datatype;
                 [string,charset(UTF16)] uint16 *parameters;
-                uint32 secdesc_ptr;
+                uint32 *secdesc_ptr;
                 spoolss_PrinterAttributes attributes;
                 [range(0,99)] uint32 priority;
@@ -1216 +1219 @@
 
         typedef struct {
-                uint32 sec_desc_ptr;
+                uint32 *sec_desc_ptr;
         } spoolss_SetPrinterInfo3;
 
@@ -1243 +1246 @@
 
         typedef struct {
-                uint32 devmode_ptr;
+                uint32 *devmode_ptr;
         } spoolss_SetPrinterInfo8;
 
         typedef struct {
-                uint32 devmode_ptr;
+                uint32 *devmode_ptr;
         } spoolss_SetPrinterInfo9;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(0)] spoolss_SetPrinterInfo0 *info0;
                 [case(1)] spoolss_SetPrinterInfo1 *info1;
@@ -1264 +1267 @@
         } spoolss_SetPrinterInfo;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 level;
                 [switch_is(level)] spoolss_SetPrinterInfo info;
         } spoolss_SetPrinterInfoCtr;
 
-        WERROR spoolss_SetPrinter(
+        [public] WERROR spoolss_SetPrinter(
                 [in,ref] policy_handle *handle,
                 [in,ref] spoolss_SetPrinterInfoCtr *info_ctr,
@@ -1348 +1351 @@
 
         typedef [bitmap32bit] bitmap {
-                PRINTER_DRIVER_PACKAGE_AWARE = 0x00000002
+                PRINTER_DRIVER_PACKAGE_AWARE            = 0x00000001,
+                PRINTER_DRIVER_XPS                      = 0x00000002,
+                PRINTER_DRIVER_SANDBOX_ENABLED          = 0x00000004,
+                PRINTER_DRIVER_CLASS                    = 0x00000008,
+                PRINTER_DRIVER_DERIVED                  = 0x00000010,
+                PRINTER_DRIVER_NOT_SHAREABLE            = 0x00000020,
+                PRINTER_DRIVER_CATEGORY_FAX             = 0x00000040,
+                PRINTER_DRIVER_CATEGORY_FILE            = 0x00000080,
+                PRINTER_DRIVER_CATEGORY_VIRTUAL         = 0x00000100,
+                PRINTER_DRIVER_CATEGORY_SERVICE         = 0x00000200,
+                PRINTER_DRIVER_SOFT_RESET_REQUIRED      = 0x00000400
         } spoolss_DriverAttributes;
 
@@ -1410 +1423 @@
                 spoolss_StringArray *color_profiles;
                 [string,charset(UTF16)] uint16 *inf_path;
-                uint32 printer_driver_attributes;
+                spoolss_DriverAttributes printer_driver_attributes;
                 [value(((ndr_size_spoolss_StringArray(core_driver_dependencies, ndr->flags)-4)/2))] uint32 _ndr_size_core_driver_dependencies;
                 spoolss_StringArray *core_driver_dependencies;
@@ -1417 +1430 @@
         } spoolss_AddDriverInfo8;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(1)] spoolss_AddDriverInfo1 *info1;
                 [case(2)] spoolss_AddDriverInfo2 *info2;
@@ -1426 +1439 @@
         } spoolss_AddDriverInfo;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 level;
                 [switch_is(level)] spoolss_AddDriverInfo info;
@@ -1538 +1551 @@
                 [relative] nstring_array *color_profiles;
                 [relative] nstring *inf_path;
-                uint32 printer_driver_attributes;
+                spoolss_DriverAttributes printer_driver_attributes;
                 [relative] nstring_array *core_driver_dependencies;
                 NTTIME min_inbox_driver_ver_date;
@@ -1735 +1748 @@
         } spoolss_DocumentInfo1;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(1)] spoolss_DocumentInfo1 *info1;
                 [case(2)]; /* TODO */
@@ -1742 +1755 @@
         } spoolss_DocumentInfo;
 
+        typedef [public] struct {
+                uint32 level;
+                [switch_is(level)] spoolss_DocumentInfo info;
+        } spoolss_DocumentInfoCtr;
+
         WERROR spoolss_StartDocPrinter(
                 [in,ref] policy_handle *handle,
-                [in] uint32 level,
-                [in,switch_is(level)] spoolss_DocumentInfo info,
+                [in,ref] spoolss_DocumentInfoCtr *info_ctr,
                 [out,ref] uint32 *job_id
         );
@@ -1818 +1835 @@
         const string SPL_ARCH_IA64              = "IA64";
         const string SPL_ARCH_X64               = "x64";
+        const string SPL_ARCH_ARM               = "ARM";
 
         const string SPOOLSS_ARCHITECTURE_ALL                   = "All";
@@ -1825 +1843 @@
         const string SPOOLSS_ARCHITECTURE_x64                   = "Windows x64";
         const string SPOOLSS_ARCHITECTURE_4_0                   = "Windows 4.0";
+        const string SPOOLSS_ARCHITECTURE_ARM                   = "Windows ARM";
         const string SPOOLSS_DEFAULT_SERVER_PATH                = "C:\\WINDOWS\\system32\\spool";
 
@@ -2030 +2049 @@
         } spoolss_AddFormInfo2;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(1)] spoolss_AddFormInfo1 *info1;
                 [case(2)] spoolss_AddFormInfo2 *info2;
         } spoolss_AddFormInfo;
 
+        typedef [public] struct {
+                uint32 level;
+                [switch_is(level)] spoolss_AddFormInfo info;
+        } spoolss_AddFormInfoCtr;
+
         WERROR spoolss_AddForm(
                 [in,ref] policy_handle *handle,
-                [in] uint32 level,
-                [in,switch_is(level)] spoolss_AddFormInfo info
+                [in,ref] spoolss_AddFormInfoCtr *info_ctr
         );
 
@@ -2065 +2088 @@
                 [in,ref] policy_handle *handle,
                 [in] [string,charset(UTF16)] uint16 form_name[],
-                [in] uint32 level,
-                [in,switch_is(level)] spoolss_AddFormInfo info
+                [in,ref] spoolss_AddFormInfoCtr *info_ctr
         );
 
@@ -2259 +2281 @@
         } spoolss_SetPortInfoFF;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(1)] spoolss_SetPortInfo1 *info1;
                 [case(2)] spoolss_SetPortInfo2 *info2;
@@ -2266 +2288 @@
         } spoolss_SetPortInfo;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 level;
                 [switch_is(level)] spoolss_SetPrinterInfo info;
@@ -2300 +2322 @@
         /******************/
         /* Function: 0x29 */
-        [todo] WERROR spoolss_PlayGDIScriptOnPrinterIC(
+
+        typedef struct {
+                uint32 Checksum;
+                uint32 Index;
+        } UNIVERSAL_FONT_ID;
+
+        typedef [public] struct {
+                uint32 count;
+                UNIVERSAL_FONT_ID fonts[count];
+        } UNIVERSAL_FONT_ID_ctr;
+
+        WERROR spoolss_PlayGDIScriptOnPrinterIC(
+                [in,ref] policy_handle *gdi_handle,
+                [in,ref] [size_is(cIn)] uint8 *pIn,
+                [in] uint32 cIn,
+                [out,ref] [size_is(cOut)] uint8 *pOut,
+                [in] uint32 cOut,
+                [in] uint32 ul
         );
 
@@ -2328 +2367 @@
         /******************/
         /* Function: 0x2e */
+
+        typedef struct {
+                [string,charset(URF16)] uint16 *monitor_name;
+        } spoolss_AddMonitorInfo1;
+
+        typedef struct {
+                [string,charset(URF16)] uint16 *monitor_name;
+                [string,charset(URF16)] uint16 *environment;
+                [string,charset(URF16)] uint16 *dll_name;
+        } spoolss_AddMonitorInfo2;
+
+        typedef [ms_union,switch_type(uint32)] union {
+                [case(1)] spoolss_AddMonitorInfo1 *info1;
+                [case(2)] spoolss_AddMonitorInfo2 *info2;
+        } spoolss_AddMonitorInfo;
+
+        typedef [public] struct {
+                uint32 level;
+                [switch_is(level)] spoolss_MonitorInfo info;
+        } spoolss_MonitorContainer;
+
         [todo] WERROR spoolss_AddMonitor(
         );
@@ -2338 +2398 @@
         /******************/
         /* Function: 0x30 */
-        [todo] WERROR spoolss_DeletePrintProcessor(
+        WERROR spoolss_DeletePrintProcessor(
+                [in,unique] [string,charset(UTF16)] uint16 *server,
+                [in,unique] [string,charset(UTF16)] uint16 *architecture,
+                [in] [string,charset(UTF16)] uint16 print_processor_name[]
         );
 
@@ -2512 +2575 @@
         /* Function: 0x3d */
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 monitor_data_size;
                 [size_is(monitor_data_size),unique] uint8 *monitor_data;
@@ -2623 +2686 @@
         } spoolssNotifyOptionFlags;
 
-        typedef struct {
+        typedef [public] struct {
                 [value(2)] uint32 version;
                 spoolssNotifyOptionFlags flags;
@@ -2655 +2718 @@
         } spoolss_NotifyTable;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union, switch_type(uint32)] union {
                 [case(1)] uint32 integer[2];
                 [case(2)] spoolss_NotifyString string;
@@ -2671 +2734 @@
         } spoolss_Notify;
 
-        typedef struct {
+        typedef [public] struct {
                 [value(2)] uint32 version;
                 uint32 flags;
@@ -2678 +2741 @@
         } spoolss_NotifyInfo;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(0)] spoolss_NotifyInfo *info0;
         } spoolss_ReplyPrinterInfo;
@@ -2738 +2801 @@
         } spoolss_UserLevel3;
 
-        typedef [switch_type(uint32)] union {
+        typedef [ms_union,switch_type(uint32)] union {
                 [case(1)]  spoolss_UserLevel1 *level1;
                 [case(2)]  spoolss_UserLevel2 *level2;
@@ -2744 +2807 @@
         } spoolss_UserLevel;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 level;
                 [switch_is(level)] spoolss_UserLevel user_info;
@@ -2818 +2881 @@
                 [in]                  spoolss_DevmodeContainer devmode_ctr,
                 [in]                  spoolss_AccessRights access_mask,
-                [in]                  uint32 level,
-                [in,switch_is(level)] spoolss_UserLevel userlevel,
+                [in]                  spoolss_UserLevelCtr userlevel_ctr,
                 [out,ref]             policy_handle *handle
         );
@@ -3015 +3077 @@
         } spoolss_PortProtocol;
 
-        typedef [public] struct {
+        typedef [public,gensize] struct {
                 [charset(UTF16)] uint16 portname[64];
                 [value(0x00000001)] uint32 version;
                 spoolss_PortProtocol protocol;
-                [value(sizeof(r))] uint32 size;
+                [value(ndr_size_spoolss_PortData1(r, ndr->flags))] uint32 size;
                 uint32 reserved;
                 [charset(UTF16)] uint16 hostaddress[49];
@@ -3033 +3095 @@
         } spoolss_PortData1;
 
-        typedef [public] struct {
+        typedef [public,gensize] struct {
                 [charset(UTF16)] uint16 portname[64];
                 [value(0x00000002)] uint32 version;
                 spoolss_PortProtocol protocol;
-                [value(sizeof(r))] uint32 size;
+                [value(ndr_size_spoolss_PortData2(r, ndr->flags))] uint32 size;
                 uint32 reserved;
                 [charset(UTF16)] uint16 hostaddress[128];
@@ -3122 +3184 @@
         /******************/
         /* Function: 0x61 */
-        [todo] WERROR spoolss_61(
+
+        const string BIDI_ACTION_ENUM_SCHEMA = "EnumSchema";
+        const string BIDI_ACTION_GET = "Get";
+        const string BIDI_ACTION_SET = "Set";
+        const string BIDI_ACTION_GET_ALL = "GetAll";
+
+        typedef enum {
+                BIDI_NULL       = 0x00000000,
+                BIDI_INT        = 0x00000001,
+                BIDI_FLOAT      = 0x00000002,
+                BIDI_BOOL       = 0x00000003,
+                BIDI_STRING     = 0x00000004,
+                BIDI_TEXT       = 0x00000005,
+                BIDI_ENUM       = 0x00000006,
+                BIDI_BLOB       = 0x00000007
+        } BIDI_TYPE;
+
+        typedef struct {
+                uint32 cbBuf;
+                [size_is(cbBuf), unique] uint8 *pszString;
+        } RPC_BINARY_CONTAINER;
+
+        typedef [ms_union,switch_type(uint32)] union {
+                [case(BIDI_NULL)]       uint32 bData;
+                [case(BIDI_BOOL)]       uint32 bData;
+                [case(BIDI_INT)]        uint32 iData;
+                [case(BIDI_STRING)]     [unique] [string,charset(UTF16)] uint16 *sData;
+                [case(BIDI_TEXT)]       [unique] [string,charset(UTF16)] uint16 *sData;
+                [case(BIDI_ENUM)]       [unique] [string,charset(UTF16)] uint16 *sData;
+                /*[case(BIDI_FLOAT)]    float fData;*/
+                [case(BIDI_BLOB)]       RPC_BINARY_CONTAINER biData;
+        } RPC_BIDI_DATA_u;
+
+        typedef struct {
+                uint32 dwBidiType;
+                [switch_is(dwBidiType)] RPC_BIDI_DATA_u u;
+        } RPC_BIDI_DATA;
+
+        typedef struct {
+                uint32 dwReqNumber;
+                [unique] [string,charset(UTF16)] uint16 *pSchema;
+                RPC_BIDI_DATA data;
+        } RPC_BIDI_REQUEST_DATA;
+
+        typedef [public] struct {
+                [value(1)] uint32 Version;
+                uint32 Flags;
+                uint32 Count;
+                [size_is(Count), unique] RPC_BIDI_REQUEST_DATA *aData[];
+        } RPC_BIDI_REQUEST_CONTAINER;
+
+        typedef struct {
+                uint32 dwResult;
+                uint32 dwReqNumber;
+                [unique] [string,charset(UTF16)] uint16 *pSchema;
+                RPC_BIDI_DATA data;
+        } RPC_BIDI_RESPONSE_DATA;
+
+        typedef [public] struct {
+                [value(1)] uint32 Version;
+                uint32 Flags;
+                uint32 Count;
+                [size_is(Count), unique] RPC_BIDI_RESPONSE_DATA *aData[];
+        } RPC_BIDI_RESPONSE_CONTAINER;
+
+        WERROR spoolss_RpcSendRecvBidiData(
+                [in] policy_handle hPrinter,
+                [in,unique] [string,charset(UTF16)] uint16 *pAction,
+                [in] RPC_BIDI_REQUEST_CONTAINER *pReqData,
+                [out] RPC_BIDI_RESPONSE_CONTAINER **ppRespData
         );
 
@@ -3147 +3278 @@
         /******************/
         /* Function: 0x66 */
-        typedef struct {
+        typedef [public] struct {
                 GUID core_driver_guid;
                 NTTIME driver_date;
@@ -3154 +3285 @@
         } spoolss_CorePrinterDriver;
 
-        WERROR spoolss_GetCorePrinterDrivers(
+        [public] WERROR spoolss_GetCorePrinterDrivers(
                 [in,unique] [string,charset(UTF16)] uint16 *servername,
                 [in,ref] [string,charset(UTF16)] uint16 *architecture,
@@ -3204 +3335 @@
         [todo] WERROR spoolss_6d(
         );
+
+        /******************/
+        /* Function: 0x6e */
+
+        const string SPLFILE_CONTENT_TYPE_PROP_NAME             = "Spool File Contents";
+        const string SPLFILE_CONTENT_TYPE_XPS_MS                = "TYPE_XPS_MS";
+        const string SPLFILE_CONTENT_TYPE_XPS_OPEN              = "TYPE_XPS_OPEN";
+        const string SPLFILE_CONTENT_TYPE_PDL_POSTSCRIPT        = "TYPE_PDL_POSTSCRIPT";
+        const string SPLFILE_CONTENT_TYPE_PDL_UNKNOWN           = "TYPE_PDL_UNKNOWN";
+
+        typedef enum {
+                kRpcPropertyTypeString  = 1,
+                kRpcPropertyTypeInt32   = 2,
+                kRpcPropertyTypeInt64   = 3,
+                kRpcPropertyTypeByte    = 4,
+                kRpcPropertyTypeBuffer  = 5
+        } RPC_EPrintPropertyType;
+
+        typedef struct {
+                uint32 cbBuf;
+                [size_is(cbBuf)] uint8 *pBuf;
+        } propertyBlob;
+
+        typedef [ms_union,switch_type(RPC_EPrintPropertyType)] union {
+                [case(kRpcPropertyTypeString)] [string,charset(UTF16)] uint16 *propertyString;
+                [case(kRpcPropertyTypeInt32)] uint32 propertyInt32;
+                [case(kRpcPropertyTypeInt64)] hyper propertyInt64;
+                [case(kRpcPropertyTypeByte)] uint8 propertyByte;
+                [case(kRpcPropertyTypeBuffer)] propertyBlob propertyBlob;
+        } RPC_PrintPropertyValueUnion;
+
+        typedef [public] struct {
+                RPC_EPrintPropertyType ePropertyType;
+                [switch_is(ePropertyType)] RPC_PrintPropertyValueUnion value;
+        } RPC_PrintPropertyValue;
+
+        typedef [public] struct {
+                [string,charset(UTF16)] uint16 *propertyName;
+                RPC_PrintPropertyValue propertyValue;
+        } RPC_PrintNamedProperty;
+
+        WERROR spoolss_RpcGetJobNamedPropertyValue(
+                [in,ref] policy_handle *hPrinter,
+                [in] uint32 JobId,
+                [in] [string,charset(UTF16)] uint16 *pszName,
+                [out,ref] RPC_PrintPropertyValue *pValue
+        );
+
+        /******************/
+        /* Function: 0x6f */
+        [public] WERROR spoolss_RpcSetJobNamedProperty(
+                [in,ref] policy_handle *hPrinter,
+                [in] uint32 JobId,
+                [in,ref] RPC_PrintNamedProperty *pProperty
+        );
+
+        /******************/
+        /* Function: 0x70 */
+        WERROR spoolss_RpcDeleteJobNamedProperty(
+                [in,ref] policy_handle *hPrinter,
+                [in] uint32 JobId,
+                [in] [string,charset(UTF16)] uint16 *pszName
+        );
+
+        /******************/
+        /* Function: 0x71 */
+        WERROR spoolss_RpcEnumJobNamedProperties(
+                [in,ref] policy_handle *hPrinter,
+                [in] uint32 JobId,
+                [out,ref] uint32 *pcProperties,
+                [out,ref,size_is(,*pcProperties)] RPC_PrintNamedProperty **ppProperties
+        );
 }

vendor/current/librpc/idl/srvsvc.idl

@@ -415 +415 @@
                 STYPE_IPC      = 3,     /* Interprocess communication (IPC) */
                 STYPE_IPC_TEMPORARY = STYPE_IPC|STYPE_TEMPORARY,
-                STYPE_IPC_HIDDEN    = STYPE_IPC|STYPE_HIDDEN
+                STYPE_IPC_HIDDEN    = STYPE_IPC|STYPE_HIDDEN,
+                STYPE_CLUSTER_FS                = 0x02000000,   /* A cluster share */
+                STYPE_CLUSTER_FS_TEMPORARY      = STYPE_CLUSTER_FS|STYPE_TEMPORARY,
+                STYPE_CLUSTER_FS_HIDDEN         = STYPE_CLUSTER_FS|STYPE_HIDDEN,
+                STYPE_CLUSTER_SOFS              = 0x04000000,   /* A Scale-Out cluster share */
+                STYPE_CLUSTER_SOFS_TEMPORARY    = STYPE_CLUSTER_SOFS|STYPE_TEMPORARY,
+                STYPE_CLUSTER_SOFS_HIDDEN       = STYPE_CLUSTER_SOFS|STYPE_HIDDEN,
+                STYPE_CLUSTER_DFS               = 0x08000000,   /* A DFS share in a cluster */
+                STYPE_CLUSTER_DFS_TEMPORARY     = STYPE_CLUSTER_DFS|STYPE_TEMPORARY,
+                STYPE_CLUSTER_DFS_HIDDEN        = STYPE_CLUSTER_DFS|STYPE_HIDDEN
         } srvsvc_ShareType;
 
@@ -492 +501 @@
         } srvsvc_NetShareCtr1004;
 
+        const uint32 SHARE_1005_CSC_CACHE_MANUAL_REINT = 0x00000000;
+
         typedef bitmap {
-                SHARE_1005_IN_DFS               = 0x00000001,
-                SHARE_1005_DFS_ROOT             = 0x00000002
+                SHARE_1005_IN_DFS                      = 0x00000001,
+                SHARE_1005_DFS_ROOT                    = 0x00000002,
+                SHARE_1005_CSC_CACHE_AUTO_REINT        = 0x00000010,
+                SHARE_1005_CSC_CACHE_VDO               = 0x00000020,
+                SHARE_1005_CSC_CACHE_NONE              = 0x00000030,
+                SHARE_1005_RESTRICT_EXCLUSIVE_OPENS    = 0x00000100,
+                SHARE_1005_FORCE_SHARED_DELETE         = 0x00000200,
+                SHARE_1005_ALLOW_NAMESPACE_CACHING     = 0x00000400,
+                SHARE_1005_ACCESS_BASED_DIRECTORY_ENUM = 0x00000800,
+                SHARE_1005_FORCE_LEVELII_OPLOCK        = 0x00001000,
+                SHARE_1005_ENABLE_HASH                 = 0x00002000,
+                SHARE_1005_ENABLE_CA                   = 0x00004000,
+                SHARE_1005_ENCRYPT_DATA                = 0x00008000
         } NetShareInfo1005Flags;
 

vendor/current/librpc/idl/svcctl.idl

@@ -81 +81 @@
         const int SERVICE_TYPE_INTERACTIVE_PROCESS = 0x100;
 
-        typedef [public,bitmap32bit] bitmap {
-                SV_TYPE_WORKSTATION       = 0x00000001,
-                SV_TYPE_SERVER            = 0x00000002,
-                SV_TYPE_SQLSERVER         = 0x00000004,
-                SV_TYPE_DOMAIN_CTRL       = 0x00000008,
-                SV_TYPE_DOMAIN_BAKCTRL    = 0x00000010,
-                SV_TYPE_TIME_SOURCE       = 0x00000020,
-                SV_TYPE_AFP               = 0x00000040,
-                SV_TYPE_NOVELL            = 0x00000080,
-
-                SV_TYPE_DOMAIN_MEMBER     = 0x00000100,
-                SV_TYPE_PRINTQ_SERVER     = 0x00000200,
-                SV_TYPE_DIALIN_SERVER     = 0x00000400,
-                SV_TYPE_SERVER_UNIX       = 0x00000800,
-                SV_TYPE_NT                = 0x00001000,
-                SV_TYPE_WFW               = 0x00002000,
-                SV_TYPE_SERVER_MFPN       = 0x00004000,
-                SV_TYPE_SERVER_NT         = 0x00008000,
-                SV_TYPE_POTENTIAL_BROWSER = 0x00010000,
-                SV_TYPE_BACKUP_BROWSER    = 0x00020000,
-                SV_TYPE_MASTER_BROWSER    = 0x00040000,
-                SV_TYPE_DOMAIN_MASTER     = 0x00080000,
-                SV_TYPE_SERVER_OSF        = 0x00100000,
-                SV_TYPE_SERVER_VMS        = 0x00200000,
-                SV_TYPE_WIN95_PLUS        = 0x00400000,
-                SV_TYPE_DFS_SERVER        = 0x00800000,
-                SV_TYPE_ALTERNATE_XPORT   = 0x20000000,
-                SV_TYPE_LOCAL_LIST_ONLY   = 0x40000000,
-                SV_TYPE_DOMAIN_ENUM       = 0x80000000
-        } svcctl_ServerType;
-
-        const uint32 SV_TYPE_ALL        = 0xFFFFFFFF;
-
         /*****************/
         /* Function 0x00 */
@@ -518 +485 @@
                 [in,ref] policy_handle *scmanager_handle,
                 [in,unique] [string,charset(UTF16)] uint16 *ServiceName,
-                [in] uint32 access_mask
+                [in] uint32 access_mask,
+                [out,ref] policy_handle *handle
         );
 

vendor/current/librpc/idl/winreg.idl

@@ -19 +19 @@
          */
 
-        typedef [bitmap32bit] bitmap {
+        typedef [public,bitmap32bit] bitmap {
                 KEY_QUERY_VALUE                 = 0x00001,
                 KEY_SET_VALUE                   = 0x00002,

vendor/current/librpc/idl/wmi.idl

@@ -36 +36 @@
 
 [
-    uuid(9A653086-174F-11d2-B5F9-00104B703EFD)
+    uuid("9A653086-174F-11d2-B5F9-00104B703EFD")
 ]
 coclass WbemClassObject
@@ -487 +487 @@
 [
         object, 
-        uuid(027947e1-d731-11ce-a357-000000000001),
+        uuid("027947e1-d731-11ce-a357-000000000001"),
         pointer_default(unique)
 ] interface IEnumWbemClassObject : IUnknown
@@ -670 +670 @@
         object,
         /*      restricted, */
-        uuid(44aca675-e8fc-11d0-a07c-00c04fb68820)
+        uuid("44aca675-e8fc-11d0-a07c-00c04fb68820")
 ] interface IWbemCallResult : IUnknown
 {
@@ -698 +698 @@
         object,
         restricted,
-        uuid(7c857801-7381-11cf-884d-00aa004b2e24)
+        uuid("7c857801-7381-11cf-884d-00aa004b2e24")
 ]
 interface IWbemObjectSink : IUnknown

vendor/current/librpc/idl/wscript_build

@@ -3 +3 @@
 bld.SAMBA_PIDL_LIST('PIDL',
                     '''atsvc.idl auth.idl drsuapi.idl epmapper.idl initshutdown.idl
-                       misc.idl ntlmssp.idl schannel.idl trkwks.idl
+                       misc.idl ntlmssp.idl negoex.idl schannel.idl trkwks.idl
                        audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl file_id.idl keysvc.idl
-                       msgsvc.idl ntsvcs.idl remact.idl security.idl unixinfo.idl wzcsvc.idl
+                       msgsvc.idl ntsvcs.idl remact.idl security.idl smb_acl.idl unixinfo.idl wzcsvc.idl
                        browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
                        named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
                        dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
-                       oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
+                       oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
                        drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
+                       notify.idl
+                       smb2_lease_struct.idl
                        policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
-                       printcap.idl''',
+                       fsrvp.idl bkupblobs.idl fscc.idl frsblobs.idl witness.idl clusapi.idl
+                       mdssvc.idl''',
                     options='--header --ndr-parser --samba3-ndr-server --server --client --python',
                     output_dir='../gen_ndr')
@@ -18 +21 @@
 bld.SAMBA_PIDL_LIST('PIDL',
                     'wmi.idl dcom.idl',
-                    options='--header --ndr-parser --server --client --python --dcom-proxy --com-header',
+                    options='--header --ndr-parser --server --client --dcom-proxy --com-header',
                     output_dir='../gen_ndr')
 
@@ -27 +30 @@
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    'rap.idl ntprinting.idl preg.idl',
+                    'messaging.idl',
                     options='--header --ndr-parser',
                     output_dir='../gen_ndr')
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    'dnsp.idl',
+                    '''rap.idl ntprinting.idl preg.idl ioctl.idl printcap.idl
+                       fsrvp_state.idl''',
+                    options='--header --ndr-parser',
+                    output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
+                    'dnsp.idl nfs4acl.idl',
                     options='--header --ndr-parser --client --python',
                     output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
+                    'winbind.idl',
+                    options='--header --ndr-parser --samba3-ndr-server --client --python',
+                    output_dir='../gen_ndr')

vendor/current/librpc/idl/xattr.idl

@@ -21 +21 @@
 {
         const char *XATTR_DOSATTRIB_NAME = "user.DosAttrib";
+        const char *XATTR_DOSATTRIB_NAME_S3 = "user.DOSATTRIB";
         const int XATTR_DOSATTRIB_ESTIMATED_SIZE = 64;
 
@@ -185 +186 @@
         } security_descriptor_hash_v3;
 
+        typedef [public] struct {
+                security_descriptor *sd;
+                uint16 hash_type;
+                uint8 hash[64]; /* 64 bytes hash. */
+                utf8string description; /* description of what created
+                                         * this hash (to allow
+                                         * foresnics later, if we have
+                                         * a bug in one codepath */
+                NTTIME time;
+                uint8 sys_acl_hash[64]; /* 64 bytes hash. */
+        } security_descriptor_hash_v4;
+
         typedef [switch_type(uint16)] union {
                 [case(1)] security_descriptor *sd;
                 [case(2)] security_descriptor_hash_v2 *sd_hs2;
                 [case(3)] security_descriptor_hash_v3 *sd_hs3;
+                [case(4)] security_descriptor_hash_v4 *sd_hs4;
         } xattr_NTACL_Info;
 
@@ -195 +209 @@
                 [switch_is(version)] xattr_NTACL_Info info;
         } xattr_NTACL;
+
+        /*
+         * A wrapper of the common information required to be in the
+         * hash of the ACL, for the acl_xattr and acl_tdb modules.
+         */
+        [public] typedef struct {
+                DATA_BLOB acl_as_blob;
+                uid_t owner;
+                gid_t group;
+                mode_t mode;
+        } xattr_sys_acl_hash_wrapper;
+
 }