Changeset 745 for trunk/server/librpc/idl

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/idl/auth.idl (copied) (copied from vendor/current/librpc/idl/auth.idl )
• librpc/idl/backupkey.idl (copied) (copied from vendor/current/librpc/idl/backupkey.idl )
• librpc/idl/dcerpc.idl (modified) (9 diffs)
• librpc/idl/dfsblobs.idl (copied) (copied from vendor/current/librpc/idl/dfsblobs.idl )
• librpc/idl/dns.idl (copied) (copied from vendor/current/librpc/idl/dns.idl )
• librpc/idl/dnsp.idl (copied) (copied from vendor/current/librpc/idl/dnsp.idl )
• librpc/idl/drsblobs.idl (modified) (20 diffs)
• librpc/idl/drsuapi.idl (modified) (72 diffs)
• librpc/idl/epmapper.idl (modified) (3 diffs)
• librpc/idl/eventlog6.idl (copied) (copied from vendor/current/librpc/idl/eventlog6.idl )
• librpc/idl/file_id.idl (copied) (copied from vendor/current/librpc/idl/file_id.idl )
• librpc/idl/frsrpc.idl (modified) (1 diff)
• librpc/idl/frstrans.idl (modified) (1 diff)
• librpc/idl/idl_types.h (modified) (1 diff)
• librpc/idl/idmap.idl (copied) (copied from vendor/current/librpc/idl/idmap.idl )
• librpc/idl/krb5pac.idl (modified) (1 diff)
• librpc/idl/lsa.idl (modified) (17 diffs)
• librpc/idl/mgmt.idl (modified) (1 diff)
• librpc/idl/misc.idl (modified) (2 diffs)
• librpc/idl/named_pipe_auth.idl (modified) (3 diffs)
• librpc/idl/nbt.idl (modified) (12 diffs)
• librpc/idl/netlogon.idl (modified) (16 diffs)
• librpc/idl/ntlmssp.idl (modified) (6 diffs)
• librpc/idl/ntprinting.idl (copied) (copied from vendor/current/librpc/idl/ntprinting.idl )
• librpc/idl/preg.idl (copied) (copied from vendor/current/librpc/idl/preg.idl )
• librpc/idl/printcap.idl (copied) (copied from vendor/current/librpc/idl/printcap.idl )
• librpc/idl/protected_storage.idl (deleted)
• librpc/idl/rap.idl (copied) (copied from vendor/current/librpc/idl/rap.idl )
• librpc/idl/samr.idl (modified) (8 diffs)
• librpc/idl/schannel.idl (modified) (1 diff)
• librpc/idl/security.idl (modified) (6 diffs)
• librpc/idl/spoolss.idl (modified) (24 diffs)
• librpc/idl/srvsvc.idl (modified) (1 diff)
• librpc/idl/winreg.idl (modified) (9 diffs)
• librpc/idl/wmi.idl (modified) (13 diffs)
• librpc/idl/wscript_build (copied) (copied from vendor/current/librpc/idl/wscript_build )
• librpc/idl/xattr.idl (modified) (1 diff)

trunk/server/librpc/idl/dcerpc.idl

@@ -20 +20 @@
         } dcerpc_ctx_list;
 
-        typedef struct {
+        typedef [public] struct {
                 uint16 max_xmit_frag;
                 uint16 max_recv_frag;
@@ -26 +26 @@
                 uint8  num_contexts;
                 dcerpc_ctx_list ctx_list[num_contexts];
-                [flag(NDR_ALIGN4)]    DATA_BLOB _pad;
                 [flag(NDR_REMAINING)] DATA_BLOB auth_info;
         } dcerpc_bind;
@@ -97 +96 @@
         } dcerpc_response;
 
+        typedef [v1_enum] enum {
+                DCERPC_NCA_S_COMM_FAILURE               = 0x1C010001,
+                DCERPC_NCA_S_OP_RNG_ERROR               = 0x1C010002,
+                DCERPC_NCA_S_UNKNOWN_IF                 = 0x1C010003,
+                DCERPC_NCA_S_WRONG_BOOT_TIME            = 0x1C010006,
+                DCERPC_NCA_S_YOU_CRASHED                = 0x1C010009,
+                DCERPC_NCA_S_PROTO_ERROR                = 0x1C01000B,
+                DCERPC_NCA_S_OUT_ARGS_TOO_BIG           = 0x1C010013,
+                DCERPC_NCA_S_SERVER_TOO_BUSY            = 0x1C010014,
+                DCERPC_NCA_S_FAULT_STRING_TOO_LARGE     = 0x1C010015,
+                DCERPC_NCA_S_UNSUPPORTED_TYPE           = 0x1C010017,
+                DCERPC_NCA_S_FAULT_INT_DIV_BY_ZERO      = 0x1C000001,
+                DCERPC_NCA_S_FAULT_ADDR_ERROR           = 0x1C000002,
+                DCERPC_NCA_S_FAULT_FP_DIV_BY_ZERO       = 0x1C000003,
+                DCERPC_NCA_S_FAULT_FP_UNDERFLOW         = 0x1C000004,
+                DCERPC_NCA_S_FAULT_FP_OVERRFLOW         = 0x1C000005,
+                DCERPC_NCA_S_FAULT_INVALID_TAG          = 0x1C000006,
+                DCERPC_NCA_S_FAULT_INVALID_BOUND        = 0x1C000007,
+                DCERPC_NCA_S_FAULT_RPC_VERSION_MISMATCH = 0x1C000008,
+                DCERPC_NCA_S_FAULT_UNSPEC_REJECT        = 0x1C000009,
+                DCERPC_NCA_S_FAULT_BAD_ACTID            = 0x1C00000A,
+                DCERPC_NCA_S_FAULT_WHO_ARE_YOU_FAILED   = 0x1C00000B,
+                DCERPC_NCA_S_FAULT_MANAGER_NOT_ENTERED  = 0x1C00000C,
+                DCERPC_NCA_S_FAULT_CANCEL               = 0x1C00000D,
+                DCERPC_NCA_S_FAULT_ILL_INST             = 0x1C00000E,
+                DCERPC_NCA_S_FAULT_FP_ERROR             = 0x1C00000F,
+                DCERPC_NCA_S_FAULT_INT_OVERFLOW         = 0x1C000010,
+                DCERPC_NCA_S_UNUSED_1C000011            = 0x1C000011,
+                DCERPC_NCA_S_FAULT_UNSPEC               = 0x1C000012,
+                DCERPC_NCA_S_FAULT_REMOTE_COMM_FAILURE  = 0x1C000013,
+                DCERPC_NCA_S_FAULT_PIPE_EMPTY           = 0x1C000014,
+                DCERPC_NCA_S_FAULT_PIPE_CLOSED          = 0x1C000015,
+                DCERPC_NCA_S_FAULT_PIPE_ORDER           = 0x1C000016,
+                DCERPC_NCA_S_FAULT_PIPE_DISCIPLINE      = 0x1C000017,
+                DCERPC_NCA_S_FAULT_PIPE_COMM_ERROR      = 0x1C000018,
+                DCERPC_NCA_S_FAULT_PIPE_MEMORY          = 0x1C000019,
+                DCERPC_NCA_S_FAULT_CONTEXT_MISMATCH     = 0x1C00001A,
+                DCERPC_NCA_S_FAULT_REMOTE_NO_MEMORY     = 0x1C00001B,
+                DCERPC_NCA_S_INVALID_PRES_CONTEXT_ID    = 0x1C00001C,
+                DCERPC_NCA_S_UNSUPPORTED_AUTHN_LEVEL    = 0x1C00001D,
+                DCERPC_NCA_S_UNUSED_1C00001E            = 0x1C00001E,
+                DCERPC_NCA_S_INVALID_CHECKSUM           = 0x1C00001F,
+                DCERPC_NCA_S_INVALID_CRC                = 0x1C000020,
+                DCERPC_NCA_S_FAULT_USER_DEFINED         = 0x1C000021,
+                DCERPC_NCA_S_FAULT_TX_OPEN_FAILED       = 0x1C000022,
+                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_status;
 
         const int DCERPC_FAULT_OP_RNG_ERROR       = 0x1c010002;
@@ -116 +164 @@
                 uint16 context_id;
                 uint8 cancel_count;
-                uint32 status;
+                dcerpc_nca_status status;
                 [flag(NDR_REMAINING)] DATA_BLOB _pad;
         } dcerpc_fault;
@@ -132 +180 @@
                 DCERPC_AUTH_TYPE_DIGEST   = 21,
                 DCERPC_AUTH_TYPE_SCHANNEL = 68,
-                DCERPC_AUTH_TYPE_MSMQ     = 100
+                DCERPC_AUTH_TYPE_MSMQ     = 100,
+                DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM = 200
         } dcerpc_AuthType;
 
@@ -158 +207 @@
 
         typedef [public] struct {
-                uint32 _pad;
+                [value(0)]            uint32    _pad;
                 [flag(NDR_REMAINING)] DATA_BLOB auth_info;
         } dcerpc_auth3;
 
         typedef [public] struct {
-                uint32 _pad;
+                [value(0)]            uint32    _pad;
                 [flag(NDR_REMAINING)] DATA_BLOB auth_info;
         } dcerpc_orphaned;
 
         typedef [public] struct {
-                uint32 _pad;
+                [value(0)]            uint32    _pad;
                 [flag(NDR_REMAINING)] DATA_BLOB auth_info;
         } dcerpc_co_cancel;
@@ -205 +254 @@
         typedef [public] struct {
         } dcerpc_working;
+
+        /* RTS data structures */
+        typedef [public] struct {
+                GUID            Cookie;
+        } RTSCookie;
+
+        typedef [v1_enum,public] enum {
+                RTS_IPV4        = 0,
+                RTS_IPV6        = 1
+        } AddressType;
+
+        typedef [nodiscriminant] union {
+                [case(RTS_IPV4)] ipv4address    ClientAddressIPV4;
+                [case(RTS_IPV6)] ipv6address    ClientAddressIPV6;
+        } ClientAddressType;
+
+        typedef [public] struct {
+                AddressType                                     AddressType;
+                [switch_is(AddressType)] ClientAddressType      ClientAddress;
+                uint8                                           Padding[12];
+        } ClientAddress;
+
+        typedef [v1_enum, public] enum {
+                FDClient        = 0,
+                FDInProxy       = 1,
+                FDServer        = 2,
+                FDOutProxy      = 3
+        } ForwardDestination;
+
+        typedef [public] struct {
+                uint32          BytesReceived;
+                uint32          AvailableWindow;
+                RTSCookie       ChannelCookie;
+        } FlowControlAcknowledgment;
+
+        /* RTS commands */
+
+        /* RTS command: 0x0 */
+        typedef [public] struct {
+                [range(0x2000,0x40000)] uint32  ReceiveWindowSize;
+        } dcerpc_rts_cmd_ReceiveWindowSize;
+
+        /* RTS command: 0x1 */
+        typedef [public] struct {
+                FlowControlAcknowledgment       Ack;
+        } dcerpc_rts_cmd_FlowControlAck;
+
+        /* RTS command: 0x2 */
+        typedef [public] struct {
+                [range(0x1D4C0,0xDBBA00)] uint32        ConnectionTimeout;
+        } dcerpc_rts_cmd_ConnectionTimeout;
+
+        /* RTS command: 0x3 */
+        typedef [public] struct {
+                RTSCookie       Cookie;
+        } dcerpc_rts_cmd_Cookie;
+
+        /* RTS command: 0x4 */
+        typedef [public] struct {
+                [range(0x20000,0x80000000)] uint32      ChannelLifetime;
+        } dcerpc_rts_cmd_ChannelLifetime;
+
+        /* RTS command: 0x5 */
+        typedef [public] struct {
+                uint32          ClientKeepalive;
+        } dcerpc_rts_cmd_ClientKeepalive;
+
+        /* RTS command: 0x6 */
+        typedef [public] struct {
+                uint32          Version;
+        } dcerpc_rts_cmd_Version;
+
+        /* RTS command: 0x7 */
+        typedef [public] struct {
+        } dcerpc_rts_cmd_Empty;
+
+        /* RTS command: 0x8 */
+        typedef [public] struct {
+                [range(0x0,0xFFFF)] uint32      ConformanceCount;
+                uint8                           Padding[ConformanceCount];
+        } dcerpc_rts_cmd_Padding;
+
+        /* RTS command: 0x9 */
+        typedef [public] struct {
+        } dcerpc_rts_cmd_NegativeANCE;
+
+        /* RTS Command: 0xA */
+        typedef [public] struct {
+        } dcerpc_rts_cmd_ANCE;
+
+        /* RTS command: 0xB */
+        typedef [public] struct {
+                ClientAddress   ClientAddress;
+        } dcerpc_rts_cmd_ClientAddress;
+
+        /* RTS command: 0xC */
+        typedef [public] struct {
+                RTSCookie       AssociationGroupId;
+        } dcerpc_rts_cmd_AssociationGroupId;
+
+        /* RTS command: 0xD */
+        typedef [public] struct {
+                ForwardDestination      ForwardDestination;
+        } dcerpc_rts_cmd_Destination;
+
+        /* RTS command: 0xE */
+        typedef [public] struct {
+                uint32  PingTrafficSent;
+        } dcerpc_rts_cmd_PingTrafficSentNotify;
+
+        typedef [nodiscriminant] union {
+                [case(0x0)] dcerpc_rts_cmd_ReceiveWindowSize            ReceiveWindowSize;
+                [case(0x1)] dcerpc_rts_cmd_FlowControlAck               FlowControlAck;
+                [case(0x2)] dcerpc_rts_cmd_ConnectionTimeout            ConnectionTimeout;
+                [case(0x3)] dcerpc_rts_cmd_Cookie                       Cookie;
+                [case(0x4)] dcerpc_rts_cmd_ChannelLifetime              ChannelLifetime;
+                [case(0x5)] dcerpc_rts_cmd_ClientKeepalive              ClientKeepalive;
+                [case(0x6)] dcerpc_rts_cmd_Version                      Version;
+                [case(0x7)] dcerpc_rts_cmd_Empty                        Empty;
+                [case(0x8)] dcerpc_rts_cmd_Padding                      Padding;
+                [case(0x9)] dcerpc_rts_cmd_NegativeANCE                 NegativeANCE;
+                [case(0xA)] dcerpc_rts_cmd_ANCE                         ANCE;
+                [case(0xB)] dcerpc_rts_cmd_ClientAddress                ClientAddress;
+                [case(0xC)] dcerpc_rts_cmd_AssociationGroupId           AssociationGroupId;
+                [case(0xD)] dcerpc_rts_cmd_Destination                  Destination;
+                [case(0xE)] dcerpc_rts_cmd_PingTrafficSentNotify        PingTrafficSentNotify;
+        } dcerpc_rts_cmds;
+
+        typedef [public] struct {
+                uint32                                          CommandType;
+                [switch_is(CommandType)] dcerpc_rts_cmds        Command;
+        } dcerpc_rts_cmd;
+
+        /* The RTS flags */
+        typedef [public, bitmap16bit] bitmap {
+                RTS_FLAG_NONE                   =       0x0000,
+                RTS_FLAG_PING                   =       0x0001,
+                RTS_FLAG_OTHER_CMD              =       0x0002,
+                RTS_FLAG_RECYCLE_CHANNEL        =       0x0004,
+                RTS_FLAG_IN_CHANNEL             =       0x0008,
+                RTS_FLAG_OUT_CHANNEL            =       0x0010,
+                RTS_FLAG_EOF                    =       0x0020,
+                RTS_FLAG_ECHO                   =       0x0040
+        } dcerpc_rts_flags;
+
+        typedef [public] struct {
+                dcerpc_rts_flags        Flags;
+                uint16                  NumberOfCommands;
+                dcerpc_rts_cmd          Commands[NumberOfCommands];
+        } dcerpc_rts;
 
         typedef [enum8bit] enum {
@@ -226 +425 @@
                 DCERPC_PKT_SHUTDOWN    = 17,    /* Server to client request to shutdown. */
                 DCERPC_PKT_CO_CANCEL   = 18,    /* Connection-oriented cancel request. */
-                DCERPC_PKT_ORPHANED    = 19     /* Client telling server it's aborting a partially sent request or telling server to stop sending replies. */
+                DCERPC_PKT_ORPHANED    = 19,    /* Client telling server it's aborting a partially sent request or telling server to stop sending replies. */
+                DCERPC_PKT_RTS         = 20     /* RTS packets used in ncacn_http */
         } dcerpc_pkt_type;
 
@@ -250 +450 @@
                 [case(DCERPC_PKT_ORPHANED)]   dcerpc_orphaned orphaned;
                 [case(DCERPC_PKT_AUTH3)]      dcerpc_auth3    auth3;
+                [case(DCERPC_PKT_RTS)]        dcerpc_rts      rts;
         } dcerpc_payload;
 

trunk/server/librpc/idl/drsblobs.idl

@@ -1 +1 @@
 #include "idl_types.h"
 
-import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl";
+import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl", "security.idl";
 
 [
@@ -11 +11 @@
 ]
 interface drsblobs {
-        typedef bitmap drsuapi_DsReplicaSyncOptions drsuapi_DsReplicaSyncOptions;
-        typedef bitmap drsuapi_DsReplicaNeighbourFlags drsuapi_DsReplicaNeighbourFlags;
+        typedef bitmap drsuapi_DrsOptions drsuapi_DrsOptions;
         typedef [v1_enum] enum drsuapi_DsAttributeId drsuapi_DsAttributeId;
         typedef [v1_enum] enum lsa_TrustAuthType lsa_TrustAuthType;
@@ -31 +30 @@
         typedef struct {
                 uint32 count;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 replPropertyMetaData1 array[count];
         } replPropertyMetaDataCtr1;
@@ -41 +40 @@
         typedef [public] struct {
                 uint32 version;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 [switch_is(version)] replPropertyMetaDataCtr ctr;
         } replPropertyMetaDataBlob;
@@ -56 +55 @@
         typedef struct {
                 uint32 count;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 drsuapi_DsReplicaCursor cursors[count];
         } replUpToDateVectorCtr1;
@@ -62 +61 @@
         typedef struct {
                 uint32 count;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 drsuapi_DsReplicaCursor2 cursors[count];
         } replUpToDateVectorCtr2;
@@ -73 +72 @@
         typedef [public] struct {
                 uint32 version;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 [switch_is(version)] replUpToDateVectorCtr ctr;
         } replUpToDateVectorBlob;
@@ -94 +93 @@
         typedef [public,gensize,flag(NDR_PAHEX)] struct {
                 /* this includes the 8 bytes of the repsFromToBlob header */
-                [value(ndr_size_repsFromTo1(this, ndr->iconv_convenience, ndr->flags)+8)] uint32 blobsize;
+                [value(ndr_size_repsFromTo1(this, ndr->flags)+8)] uint32 blobsize;
                 uint32 consecutive_sync_failures;
                 NTTIME_1sec last_success;
@@ -100 +99 @@
                 WERROR result_last_attempt;
                 [relative] repsFromTo1OtherInfo *other_info;
-                [value(ndr_size_repsFromTo1OtherInfo(other_info, ndr->iconv_convenience, ndr->flags))] uint32 other_info_length;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                [value(ndr_size_repsFromTo1OtherInfo(other_info, ndr->flags))] uint32 other_info_length;
+                drsuapi_DrsOptions replica_flags;
                 uint8 schedule[84];
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 drsuapi_DsReplicaHighWaterMark highwatermark;
                 GUID source_dsa_obj_guid; /* the 'objectGuid' field of the CN=NTDS Settings object */
@@ -111 +110 @@
 
         typedef [public,relative_base,gensize] struct {
-                [value(ndr_size_repsFromTo2OtherInfo(this,ndr->iconv_convenience, ndr->flags))]
+                [value(ndr_size_repsFromTo2OtherInfo(this,ndr->flags))]
                         uint32 __ndr_size;
                 [relative] nstring *dns_name1;
@@ -121 +120 @@
         typedef [public,gensize,flag(NDR_PAHEX)] struct {
                 /* this includes the 8 bytes of the repsFromToBlob header */
-                [value(ndr_size_repsFromTo2(this, ndr->iconv_convenience, ndr->flags)+8)] uint32 blobsize;
+                [value(ndr_size_repsFromTo2(this, ndr->flags)+8)] uint32 blobsize;
                 uint32 consecutive_sync_failures;
                 NTTIME_1sec last_success;
@@ -127 +126 @@
                 WERROR result_last_attempt;
                 [relative] repsFromTo2OtherInfo *other_info;
-                [value(ndr_size_repsFromTo2OtherInfo(other_info, ndr->iconv_convenience, ndr->flags))] uint32 other_info_length;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                [value(ndr_size_repsFromTo2OtherInfo(other_info, ndr->flags))] uint32 other_info_length;
+                drsuapi_DrsOptions replica_flags;
                 uint8 schedule[84];
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 drsuapi_DsReplicaHighWaterMark highwatermark;
                 GUID source_dsa_obj_guid; /* the 'objectGuid' field of the CN=NTDS Settings object */
@@ -145 +144 @@
         typedef [public] struct {
                 uint32 version;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 [switch_is(version)] repsFromTo ctr;
         } repsFromToBlob;
@@ -169 +168 @@
         typedef [public] struct {
                 uint32 version;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 [switch_is(version)] partialAttributeSetCtr ctr;
         } partialAttributeSetBlob;
@@ -176 +175 @@
                 [in] partialAttributeSetBlob blob
                 );
+
+
+        /*
+         * schemaInfo attribute
+         *
+         * Used as an attribute on Schema.
+         * Also during replication as part of
+         * prefixMap to identify what revision
+         * of Schema source DC has
+         */
+        typedef [public,flag(NDR_NOALIGN)] struct {
+                [value(0xFF)] uint8 marker;
+                [flag(NDR_BIG_ENDIAN)] uint32 revision;
+                GUID   invocation_id;
+        } schemaInfoBlob;
+
+
+        /*
+         * MS w2k3 and w2k8 prefixMap format
+         * There is no version number. Format is:
+         *   uint32 - number of entries in the map
+         *   uint32 - total bytes that structure occupies
+         *   ENTRIES:
+         *     uint16 - prefix ID (OID's last sub-id encoded. see prefixMap)
+         *     uint16 - number of bytes in prefix N
+         *     uint8[N] - BER encoded prefix
+         */
+        typedef [noprint,flag(NDR_NOALIGN)] struct {
+                uint16 entryID;
+                uint16 length;
+                uint8 binary_oid[length];
+        } drsuapi_MSPrefixMap_Entry;
+
+        typedef [public,gensize] struct {
+                uint32 num_entries;
+                [value(ndr_size_drsuapi_MSPrefixMap_Ctr(r, ndr->flags))] uint32 __ndr_size;
+                drsuapi_MSPrefixMap_Entry entries[num_entries];
+        } drsuapi_MSPrefixMap_Ctr;
 
         /*
@@ -197 +234 @@
         typedef [public] struct {
                 prefixMapVersion version;
-                uint32 reserved;
+                [value(0)] uint32 reserved;
                 [switch_is(version)] prefixMapCtr ctr;
         } prefixMapBlob;
@@ -219 +256 @@
                 uint32 u2;
                 uint32 u3;
-                [value(ndr_size_ldapControlDirSyncExtra(&extra, extra.uptodateness_vector.version, ndr->iconv_convenience, 0))] 
+                [value(ndr_size_ldapControlDirSyncExtra(&extra, extra.uptodateness_vector.version, 0))] 
                         uint32 extra_length;
                 drsuapi_DsReplicaHighWaterMark highwatermark;
@@ -280 +317 @@
         typedef [public] struct {
                 [value(0)] uint32 unknown1;
-                [value(ndr_size_supplementalCredentialsSubBlob(&sub, ndr->iconv_convenience, ndr->flags))] uint32 __ndr_size;
+                [value(ndr_size_supplementalCredentialsSubBlob(&sub, ndr->flags))] uint32 __ndr_size;
                 [value(0)] uint32 unknown2;
                 [subcontext(0),subcontext_size(__ndr_size)] supplementalCredentialsSubBlob sub;
@@ -432 +469 @@
                 NTTIME LastUpdateTime;
                 lsa_TrustAuthType AuthType;
-                
                 [switch_is(AuthType)] AuthInfo AuthInfo;
                 [flag(NDR_ALIGN4)] DATA_BLOB _pad;
         } AuthenticationInformation;
 
-        typedef [nopull,nopush,noprint] struct {
-                /* sizeis here is bogus, but this is here just for the structure */
-                [size_is(1)] AuthenticationInformation array[];
+        /* count is not on the wire */
+        typedef [public,nopull,nopush,gensize] struct {
+                uint32 count;
+                AuthenticationInformation array[count];
         } AuthenticationInformationArray;
 
-        /* This is nopull,nopush because we pass count down to the
-         * manual parser of AuthenticationInformationArray */
-        typedef [public,nopull,nopush,noprint,gensize] struct {
+        /* we cannot use [relative] pointers here because Windows expects the
+         * previous_offset to match the total size of the struct in case
+         * the previous array is empty, see MS-LSAD 2.2.7.16 - gd */
+        typedef [public,gensize,nopush] struct {
                 uint32 count;
-                [relative] AuthenticationInformationArray *current;
-                [relative] AuthenticationInformationArray *previous;
+                [value((count > 0) ? 12 : 0)] uint32 current_offset;
+                [value((count > 0) ? 12 + ndr_size_AuthenticationInformationArray(&current, ndr->flags) : 0)] uint32 previous_offset;
+                [subcontext(0),subcontext_size((previous_offset)-(current_offset))] AuthenticationInformationArray current;
+                [subcontext(0)] [flag(NDR_REMAINING)] AuthenticationInformationArray previous;
         } trustAuthInOutBlob;
 
-        void decode_trustAuthInOut(
+        [nopython] void decode_trustAuthInOut(
                 [in] trustAuthInOutBlob blob
                 );
-
-        typedef [public,gensize] struct {
-                uint32 count;
-                [relative] AuthenticationInformation *current[count];
-        } trustCurrentPasswords;
 
         typedef [public,nopull] struct {
                 uint8 confounder[512];
-                [subcontext(0),subcontext_size(outgoing_size)] trustCurrentPasswords outgoing;
-                [subcontext(0),subcontext_size(incoming_size)] trustCurrentPasswords incoming;
-                [value(ndr_size_trustCurrentPasswords(&outgoing, ndr->iconv_convenience, ndr->flags))] uint32 outgoing_size;
-                [value(ndr_size_trustCurrentPasswords(&incoming, ndr->iconv_convenience, ndr->flags))] uint32 incoming_size;
+                [subcontext(0),subcontext_size(outgoing_size)] trustAuthInOutBlob outgoing;
+                [subcontext(0),subcontext_size(incoming_size)] trustAuthInOutBlob incoming;
+                [value(ndr_size_trustAuthInOutBlob(&outgoing, ndr->flags))] uint32 outgoing_size;
+                [value(ndr_size_trustAuthInOutBlob(&incoming, ndr->flags))] uint32 incoming_size;
         } trustDomainPasswords;
 
-        void decode_trustDomainPasswords(
+        [nopython] void decode_trustDomainPasswords(
                 [in] trustDomainPasswords blob
                 );
@@ -548 +583 @@
         } ExtendedErrorInfoPtr;
 
-        void decode_ExtendedErrorInfo (
+        [nopython] void decode_ExtendedErrorInfo (
                 [in,subcontext(0xFFFFFC01)] ExtendedErrorInfoPtr ptr
                 );
+
+        /* MS-ADTS 7.1.6.9.3 msDS-TrustForestTrustInfo Attribute */
+
+        typedef struct {
+                [value(strlen_m(string))] uint32 size;
+                [charset(UTF8)] uint8 string[size];
+        } ForestTrustString;
+
+        typedef [flag(NDR_NOALIGN)] struct {
+                [value(ndr_size_dom_sid0(&sid, ndr->flags))] uint32 sid_size;
+                [subcontext(0),subcontext_size(sid_size)] dom_sid sid;
+                ForestTrustString dns_name;
+                ForestTrustString netbios_name;
+        } ForestTrustDataDomainInfo;
+
+        typedef [flag(NDR_NOALIGN)] struct {
+                uint32 size;
+                uint8 data[size];
+        } ForestTrustDataBinaryData;
+
+        typedef [nodiscriminant] union {
+                [case(FOREST_TRUST_TOP_LEVEL_NAME)] ForestTrustString name;
+                [case(FOREST_TRUST_TOP_LEVEL_NAME_EX)] ForestTrustString name;
+                [case(FOREST_TRUST_DOMAIN_INFO)] ForestTrustDataDomainInfo info;
+                [default] ForestTrustDataBinaryData data;
+        } ForestTrustData;
+
+        /* same as lsa_ForestTrustRecordType */
+        typedef [enum8bit] enum {
+                FOREST_TRUST_TOP_LEVEL_NAME = 0,
+                FOREST_TRUST_TOP_LEVEL_NAME_EX = 1,
+                FOREST_TRUST_DOMAIN_INFO = 2
+        } ForestTrustInfoRecordType;
+
+        /* meaning of flags depends on record type and values are
+           the same as in lsa.idl, see collision record types */
+        typedef [public,gensize,flag(NDR_NOALIGN)] struct {
+                uint32 flags;
+                NTTIME timestamp;
+                ForestTrustInfoRecordType type;
+                [switch_is(type)] ForestTrustData data;
+        } ForestTrustInfoRecord;
+
+        typedef [flag(NDR_NOALIGN)] struct {
+                [value(ndr_size_ForestTrustInfoRecord(&record, ndr->flags))] uint32 record_size;
+                ForestTrustInfoRecord record;
+        } ForestTrustInfoRecordArmor;
+
+        typedef [public,flag(NDR_NOALIGN)] struct {
+                uint32 version;
+                uint32 count;
+                ForestTrustInfoRecordArmor records[count];
+        } ForestTrustInfo;
+
+        [nopython] void decode_ForestTrustInfo(
+                [in] ForestTrustInfo blob
+                );
 }

trunk/server/librpc/idl/drsuapi.idl

@@ -1 +1 @@
 #include "idl_types.h"
 
-import "security.idl", "misc.idl", "samr.idl";
+import "security.idl", "misc.idl", "lsa.idl", "samr.idl";
 
 [
@@ -16 +16 @@
         typedef bitmap samr_GroupAttrs samr_GroupAttrs;
 
+        /* see MS-DRSR section 5.39 */
+        typedef [public,bitmap32bit] bitmap {
+                DRSUAPI_DRS_ASYNC_OP                  = 0x00000001,
+                DRSUAPI_DRS_GETCHG_CHECK              = 0x00000002,
+                DRSUAPI_DRS_UPDATE_NOTIFICATION       = 0x00000002,
+                DRSUAPI_DRS_ADD_REF                   = 0x00000004,
+                DRSUAPI_DRS_SYNC_ALL                  = 0x00000008,
+                DRSUAPI_DRS_DEL_REF                   = 0x00000008,
+                DRSUAPI_DRS_WRIT_REP                  = 0x00000010,
+                DRSUAPI_DRS_INIT_SYNC                 = 0x00000020,
+                DRSUAPI_DRS_PER_SYNC                  = 0x00000040,
+                DRSUAPI_DRS_MAIL_REP                  = 0x00000080,
+                DRSUAPI_DRS_ASYNC_REP                 = 0x00000100,
+                DRSUAPI_DRS_IGNORE_ERROR              = 0x00000100,
+                DRSUAPI_DRS_TWOWAY_SYNC               = 0x00000200,
+                DRSUAPI_DRS_CRITICAL_ONLY             = 0x00000400,
+                DRSUAPI_DRS_GET_ANC                   = 0x00000800,
+                DRSUAPI_DRS_GET_NC_SIZE               = 0x00001000,
+                DRSUAPI_DRS_LOCAL_ONLY                = 0x00001000,
+                DRSUAPI_DRS_NONGC_RO_REP              = 0x00002000,
+                DRSUAPI_DRS_SYNC_BYNAME               = 0x00004000,
+                DRSUAPI_DRS_REF_OK                    = 0x00004000,
+                DRSUAPI_DRS_FULL_SYNC_NOW             = 0x00008000,
+                DRSUAPI_DRS_NO_SOURCE                 = 0x00008000,
+                DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS     = 0x00010000,
+                DRSUAPI_DRS_FULL_SYNC_PACKET          = 0x00020000,
+                DRSUAPI_DRS_SYNC_REQUEUE              = 0x00040000,
+                DRSUAPI_DRS_SYNC_URGENT               = 0x00080000,
+                DRSUAPI_DRS_REF_GCSPN                 = 0x00100000,
+                DRSUAPI_DRS_NO_DISCARD                = 0x00100000,
+                DRSUAPI_DRS_NEVER_SYNCED              = 0x00200000,
+                DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING = 0x00400000,
+                DRSUAPI_DRS_INIT_SYNC_NOW             = 0x00800000,
+                DRSUAPI_DRS_PREEMPTED                 = 0x01000000,
+                DRSUAPI_DRS_SYNC_FORCED               = 0x02000000,
+                DRSUAPI_DRS_DISABLE_AUTO_SYNC         = 0x04000000,
+                DRSUAPI_DRS_DISABLE_PERIODIC_SYNC     = 0x08000000,
+                DRSUAPI_DRS_USE_COMPRESSION           = 0x10000000,
+                DRSUAPI_DRS_NEVER_NOTIFY              = 0x20000000,
+                DRSUAPI_DRS_SYNC_PAS                  = 0x40000000,
+                DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP  = 0x80000000
+        } drsuapi_DrsOptions;
+
         /*****************/
         /* Function 0x00 */
@@ -26 +69 @@
                 DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1                   = 0x00000020,
                 DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION    = 0x00000040,
-                DRSUAPI_SUPPORTED_EXTENSION_00000080                    = 0x00000080,
+                DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY                    = 0x00000080,
                 DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE                 = 0x00000100,
                 DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2                 = 0x00000200,
@@ -39 +82 @@
                 DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY             = 0x00040000,
                 DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3                  = 0x00080000,
-                DRSUAPI_SUPPORTED_EXTENSION_00100000                    = 0x00100000,
+                DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5                = 0x00100000,
                 DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2            = 0x00200000,
                 DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6                = 0x00400000,
@@ -54 +97 @@
                 DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT               = 0x08000000,
                 DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS             = 0x10000000,
-                DRSUAPI_SUPPORTED_EXTENSION_20000000                    = 0x20000000,
-                DRSUAPI_SUPPORTED_EXTENSION_40000000                    = 0x40000000,
-                DRSUAPI_SUPPORTED_EXTENSION_80000000                    = 0x80000000
+                DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10               = 0x20000000,
+                DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2              = 0x40000000,
+                DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART3              = 0x80000000
         } drsuapi_SupportedExtensions;
 
         typedef [bitmap32bit] bitmap {
                 DRSUAPI_SUPPORTED_EXTENSION_ADAM                        = 0x00000001,
-                DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2                    = 0x00000002
+                DRSUAPI_SUPPORTED_EXTENSION_LH_BETA2                    = 0x00000002,
+                DRSUAPI_SUPPORTED_EXTENSION_RECYCLE_BIN                 = 0x00000004
         } drsuapi_SupportedExtensionsExt;
 
@@ -143 +187 @@
         /* Function 0x02 */
         typedef [public,gensize] struct {
-                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->iconv_convenience, ndr->flags)-4)] uint32 __ndr_size;
+                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier(r, ndr->flags)-4)] uint32 __ndr_size;
                 [value(ndr_size_dom_sid28(&sid, ndr->flags))]  uint32 __ndr_size_sid;
                 GUID guid;
@@ -151 +195 @@
         } drsuapi_DsReplicaObjectIdentifier;
 
-        typedef [public] bitmap {
-                DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION  = 0x00000001,
-                DRSUAPI_DS_REPLICA_SYNC_WRITEABLE               = 0x00000002,
-                DRSUAPI_DS_REPLICA_SYNC_PERIODIC                = 0x00000004,
-                DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING     = 0x00000008,
-                DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES             = 0x00000010,
-                DRSUAPI_DS_REPLICA_SYNC_FULL                    = 0x00000020,
-                DRSUAPI_DS_REPLICA_SYNC_URGENT                  = 0x00000040,
-                DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD              = 0x00000080,
-                DRSUAPI_DS_REPLICA_SYNC_FORCE                   = 0x00000100,
-                DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE           = 0x00000200,
-                DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED         = 0x00000400,
-                DRSUAPI_DS_REPLICA_SYNC_TWO_WAY                 = 0x00000800,
-                DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY            = 0x00001000,
-                DRSUAPI_DS_REPLICA_SYNC_INITIAL                 = 0x00002000,
-                DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION         = 0x00004000,
-                DRSUAPI_DS_REPLICA_SYNC_ABANDONED               = 0x00008000,
-                DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS     = 0x00010000,
-                DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET   = 0x00020000,
-                DRSUAPI_DS_REPLICA_SYNC_REQUEUE                 = 0x00040000,
-                DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION            = 0x00080000,
-                DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA    = 0x00100000,
-                DRSUAPI_DS_REPLICA_SYNC_CRITICAL                = 0x00200000,
-                DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS        = 0x00400000,
-                DRSUAPI_DS_REPLICA_SYNC_PREEMPTED               = 0x00800000
-        } drsuapi_DsReplicaSyncOptions;
-
-        typedef struct {
-                drsuapi_DsReplicaObjectIdentifier *naming_context;
+        typedef struct {
+                [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
                 GUID source_dsa_guid;
-                astring *other_info; /* I assume this is related to the repsFromTo1OtherInfo dns_name */
-                drsuapi_DsReplicaSyncOptions options;
+                astring *source_dsa_dns; /* Source DSA dns_name in <guid>._msdcs.<domain_dns> form */
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaSyncRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsReplicaSyncRequest1 req1;
         } drsuapi_DsReplicaSyncRequest;
@@ -191 +208 @@
         WERROR drsuapi_DsReplicaSync(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
-                [in,switch_is(level)] drsuapi_DsReplicaSyncRequest req
+                [in] uint32 level,
+                [in,switch_is(level)] drsuapi_DsReplicaSyncRequest *req
                 );
 
@@ -215 +232 @@
                 [size_is(count)] drsuapi_DsReplicaCursor cursors[];
         } drsuapi_DsReplicaCursorCtrEx;
-
-        typedef [public] bitmap {
-                /* the _WRITEABLE flag indicates a replication with all attributes
-                 *
-                 * --metze
-                 */
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE                          = 0x00000010,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP                    = 0x00000020,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS                 = 0x00000040,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_USE_ASYNC_INTERSIDE_TRANSPORT      = 0x00000080,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_ASYNC_REP                          = 0x00000100,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_IGNORE_ERROR                       = 0x00000100,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_TWO_WAY_SYNC                       = 0x00000200,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_CRITICAL_ONLY                      = 0x00000400,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS              = 0x00000800,/*Include updates to ancestor objects before updates to their descendants*/
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_IN_PROGRESS                   = 0x00010000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_FULL_SYNC_PACKET                   = 0x00020000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED                       = 0x00200000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_SPECIAL_SECRET_PROCESSING          = 0x00800000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_PREEMPTED                          = 0x01000000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_IGNORE_CHANGE_NOTIFICATIONS        = 0x04000000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_DISABLE_SCHEDULED_SYNC             = 0x08000000,
-                /*
-                 * the following NOTE applies to DsGetNCChangesRequest5:
-                 *  - the data is only compressed when 10 or more objects are replicated
-                 *  - but there could also be a size limit of 35 KBytes or something like that
-                 *  - the reply is DsGetNCChangesCtr2
-                 *  - maybe the same applies to DsGetNCChangesRequest8...
-                 *
-                 *  --metze
-                 */
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES                   = 0x10000000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_NO_CHANGE_NOTIFICATIONS            = 0x20000000,
-                DRSUAPI_DS_REPLICA_NEIGHBOUR_PARTIAL_ATTRIBUTE_SET              = 0x40000000
-        } drsuapi_DsReplicaNeighbourFlags;
 
         typedef [flag(NDR_PAHEX),v1_enum] enum {
@@ -288 +270 @@
                 drsuapi_DsReplicaHighWaterMark highwatermark;
                 drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                drsuapi_DrsOptions replica_flags;
                 uint32 max_object_count; /* w2k3 uses min(133,max(100,max_object_count)) */
                 uint32 max_ndr_size; /* w2k3 seems to ignore this */
@@ -379 +361 @@
          * 2.5.5.17     => dom_sid
          */
-        typedef [nopush,nopull] struct {
-                [range(0,10000),value(ndr_size_drsuapi_DsReplicaOID_oid(oid, 0))] uint32 __ndr_size;
-                [size_is(__ndr_size),charset(DOS)] uint8 *oid; /* it's encoded with asn1_write_OID_String() */
+        typedef [noprint] struct {
+                [range(0,10000)] uint32 length;
+                [size_is(length)] uint8 *binary_oid; /* partial-binary-OID encoded with asn1_write_partial_OID_String() */
         } drsuapi_DsReplicaOID;
 
@@ -401 +383 @@
 
         typedef [flag(NDR_PAHEX),v1_enum,public] enum {
-                DRSUAPI_ATTRIBUTE_objectClass                   = 0x00000000,
-                DRSUAPI_ATTRIBUTE_description                   = 0x0000000d,
-                DRSUAPI_ATTRIBUTE_member                        = 0x0000001f,
-                DRSUAPI_ATTRIBUTE_instanceType                  = 0x00020001,
-                DRSUAPI_ATTRIBUTE_whenCreated                   = 0x00020002,
-                DRSUAPI_ATTRIBUTE_possSuperiors                 = 0x00020008,
-                DRSUAPI_ATTRIBUTE_hasMasterNCs                  = 0x0002000e,
-                DRSUAPI_ATTRIBUTE_subClassOf                    = 0x00020015,
-                DRSUAPI_ATTRIBUTE_governsID                     = 0x00020016,
-                DRSUAPI_ATTRIBUTE_mustContain                   = 0x00020018,
-                DRSUAPI_ATTRIBUTE_mayContain                    = 0x00020019,
-                DRSUAPI_ATTRIBUTE_attributeID                   = 0x0002001e,
-                DRSUAPI_ATTRIBUTE_attributeSyntax               = 0x00020020,
-                DRSUAPI_ATTRIBUTE_isSingleValued                = 0x00020021,
-                DRSUAPI_ATTRIBUTE_rangeLower                    = 0x00020022,
-                DRSUAPI_ATTRIBUTE_rangeUpper                    = 0x00020023,
-                DRSUAPI_ATTRIBUTE_dMDLocation                   = 0x00020024,
-                DRSUAPI_ATTRIBUTE_objectVersion                 = 0x0002004c,
-                DRSUAPI_ATTRIBUTE_invocationId                  = 0x00020073,
-                DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly        = 0x000200a9,
-                DRSUAPI_ATTRIBUTE_adminDisplayName              = 0x000200c2,
-                DRSUAPI_ATTRIBUTE_adminDescription              = 0x000200e2,
-                DRSUAPI_ATTRIBUTE_oMSyntax                      = 0x000200e7,
-                DRSUAPI_ATTRIBUTE_ntSecurityDescriptor          = 0x00020119,
-                DRSUAPI_ATTRIBUTE_searchFlags                   = 0x0002014e,
-                DRSUAPI_ATTRIBUTE_auxiliaryClass                = 0x0002015f,
-                DRSUAPI_ATTRIBUTE_lDAPDisplayName               = 0x000201cc,
-                DRSUAPI_ATTRIBUTE_name                          = 0x00090001,
-                DRSUAPI_ATTRIBUTE_userAccountControl            = 0x00090008,
-                DRSUAPI_ATTRIBUTE_currentValue                  = 0x0009001b,
-                DRSUAPI_ATTRIBUTE_homeDirectory                 = 0x0009002c,
-                DRSUAPI_ATTRIBUTE_homeDrive                     = 0x0009002d,
-                DRSUAPI_ATTRIBUTE_scriptPath                    = 0x0009003e,
-                DRSUAPI_ATTRIBUTE_profilePath                   = 0x0009008b,
-                DRSUAPI_ATTRIBUTE_objectSid                     = 0x00090092,
-                DRSUAPI_ATTRIBUTE_schemaIDGUID                  = 0x00090094,
-                DRSUAPI_ATTRIBUTE_dBCSPwd                       = 0x00090037,/* lmPwdHash */
-                DRSUAPI_ATTRIBUTE_logonHours                    = 0x00090040,
-                DRSUAPI_ATTRIBUTE_userWorkstations              = 0x00090056,
-                DRSUAPI_ATTRIBUTE_unicodePwd                    = 0x0009005a,/* ntPwdHash */
-                DRSUAPI_ATTRIBUTE_ntPwdHistory                  = 0x0009005e,
-                DRSUAPI_ATTRIBUTE_priorValue                    = 0x00090064,
-                DRSUAPI_ATTRIBUTE_supplementalCredentials       = 0x0009007d,
-                DRSUAPI_ATTRIBUTE_trustAuthIncoming             = 0x00090081,
-                DRSUAPI_ATTRIBUTE_trustAuthOutgoing             = 0x00090087,
-                DRSUAPI_ATTRIBUTE_lmPwdHistory                  = 0x000900a0,
-                DRSUAPI_ATTRIBUTE_systemPossSuperiors           = 0x000900c3,
-                DRSUAPI_ATTRIBUTE_systemMayContain              = 0x000900c4,
-                DRSUAPI_ATTRIBUTE_systemMustContain             = 0x000900c5,
-                DRSUAPI_ATTRIBUTE_sAMAccountName                = 0x000900dd,
-                DRSUAPI_ATTRIBUTE_sAMAccountType                = 0x0009012e,
-                DRSUAPI_ATTRIBUTE_fSMORoleOwner                 = 0x00090171,
-                DRSUAPI_ATTRIBUTE_systemFlags                   = 0x00090177,
-                DRSUAPI_ATTRIBUTE_serverReference               = 0x00090203,
-                DRSUAPI_ATTRIBUTE_serverReferenceBL             = 0x00090204,
-                DRSUAPI_ATTRIBUTE_initialAuthIncoming           = 0x0009021b,
-                DRSUAPI_ATTRIBUTE_initialAuthOutgoing           = 0x0009021c,
-                DRSUAPI_ATTRIBUTE_wellKnownObjects              = 0x0009026a,
-                DRSUAPI_ATTRIBUTE_dNSHostName                   = 0x0009026b,
-                DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet = 0x0009027f,
-                DRSUAPI_ATTRIBUTE_userPrincipalName             = 0x00090290,
-                DRSUAPI_ATTRIBUTE_groupType                     = 0x000902ee,
-                DRSUAPI_ATTRIBUTE_servicePrincipalName          = 0x00090303,
-                DRSUAPI_ATTRIBUTE_objectCategory                = 0x0009030e,
-                DRSUAPI_ATTRIBUTE_gPLink                        = 0x0009037b,
-                DRSUAPI_ATTRIBUTE_msDS_Behavior_Version         = 0x000905b3,
-                DRSUAPI_ATTRIBUTE_msDS_KeyVersionNumber         = 0x000906f6,
-                DRSUAPI_ATTRIBUTE_msDS_HasDomainNCs             = 0x0009071c,
-                DRSUAPI_ATTRIBUTE_msDS_hasMasterNCs             = 0x0009072c
+                DRSUAPI_ATTID_objectClass                       = 0x00000000,
+                DRSUAPI_ATTID_cn                                = 0x00000003,
+                DRSUAPI_ATTID_ou                                = 0x0000000b,
+                DRSUAPI_ATTID_description                       = 0x0000000d,
+                DRSUAPI_ATTID_member                            = 0x0000001f,
+                DRSUAPI_ATTID_instanceType                      = 0x00020001,
+                DRSUAPI_ATTID_whenCreated                       = 0x00020002,
+                DRSUAPI_ATTID_possSuperiors                     = 0x00020008,
+                DRSUAPI_ATTID_displayName                       = 0x0002000d,
+                DRSUAPI_ATTID_hasMasterNCs                      = 0x0002000e,
+                DRSUAPI_ATTID_subClassOf                        = 0x00020015,
+                DRSUAPI_ATTID_governsID                         = 0x00020016,
+                DRSUAPI_ATTID_mustContain                       = 0x00020018,
+                DRSUAPI_ATTID_mayContain                        = 0x00020019,
+                DRSUAPI_ATTID_rDNAttId                          = 0x0002001A,
+                DRSUAPI_ATTID_attributeID                       = 0x0002001e,
+                DRSUAPI_ATTID_attributeSyntax                   = 0x00020020,
+                DRSUAPI_ATTID_isSingleValued                    = 0x00020021,
+                DRSUAPI_ATTID_rangeLower                        = 0x00020022,
+                DRSUAPI_ATTID_rangeUpper                        = 0x00020023,
+                DRSUAPI_ATTID_dMDLocation                       = 0x00020024,
+                DRSUAPI_ATTID_isDeleted                         = 0x00020030,
+                DRSUAPI_ATTID_objectVersion                     = 0x0002004c,
+                DRSUAPI_ATTID_invocationId                      = 0x00020073,
+                DRSUAPI_ATTID_showInAdvancedViewOnly            = 0x000200a9,
+                DRSUAPI_ATTID_adminDisplayName                  = 0x000200c2,
+                DRSUAPI_ATTID_adminDescription                  = 0x000200e2,
+                DRSUAPI_ATTID_oMSyntax                          = 0x000200e7,
+                DRSUAPI_ATTID_ntSecurityDescriptor              = 0x00020119,
+                DRSUAPI_ATTID_searchFlags                       = 0x0002014e,
+                DRSUAPI_ATTID_auxiliaryClass                    = 0x0002015f,
+                DRSUAPI_ATTID_lDAPDisplayName                   = 0x000201cc,
+                DRSUAPI_ATTID_name                              = 0x00090001,
+                DRSUAPI_ATTID_userAccountControl                = 0x00090008,
+                DRSUAPI_ATTID_badPwdCount                       = 0x0009000c,
+                DRSUAPI_ATTID_codePage                          = 0x00090010,
+                DRSUAPI_ATTID_countryCode                       = 0x00090019,
+                DRSUAPI_ATTID_currentValue                      = 0x0009001b,
+                DRSUAPI_ATTID_homeDirectory                     = 0x0009002c,
+                DRSUAPI_ATTID_homeDrive                         = 0x0009002d,
+                DRSUAPI_ATTID_lastLogoff                        = 0x00090033,
+                DRSUAPI_ATTID_lastLogon                         = 0x00090034,
+                DRSUAPI_ATTID_dBCSPwd                           = 0x00090037,/* lmPwdHash */
+                DRSUAPI_ATTID_scriptPath                        = 0x0009003e,
+                DRSUAPI_ATTID_logonHours                        = 0x00090040,
+                DRSUAPI_ATTID_userWorkstations                  = 0x00090056,
+                DRSUAPI_ATTID_unicodePwd                        = 0x0009005a,/* ntPwdHash */
+                DRSUAPI_ATTID_ntPwdHistory                      = 0x0009005e,
+                DRSUAPI_ATTID_pwdLastSet                        = 0x00090060,
+                DRSUAPI_ATTID_primaryGroupID                    = 0x00090062,
+                DRSUAPI_ATTID_priorValue                        = 0x00090064,
+                DRSUAPI_ATTID_supplementalCredentials           = 0x0009007d,
+                DRSUAPI_ATTID_trustAuthIncoming                 = 0x00090081,
+                DRSUAPI_ATTID_trustAuthOutgoing                 = 0x00090087,
+                DRSUAPI_ATTID_userParameters                    = 0x0009008a,
+                DRSUAPI_ATTID_profilePath                       = 0x0009008b,
+                DRSUAPI_ATTID_objectSid                         = 0x00090092,
+                DRSUAPI_ATTID_schemaIDGUID                      = 0x00090094,
+                DRSUAPI_ATTID_comment                           = 0x0009009C,/* User-Comment */
+                DRSUAPI_ATTID_accountExpires                    = 0x0009009f,
+                DRSUAPI_ATTID_lmPwdHistory                      = 0x000900a0,
+                DRSUAPI_ATTID_logonCount                        = 0x000900a9,
+                DRSUAPI_ATTID_systemPossSuperiors               = 0x000900c3,
+                DRSUAPI_ATTID_systemMayContain                  = 0x000900c4,
+                DRSUAPI_ATTID_systemMustContain                 = 0x000900c5,
+                DRSUAPI_ATTID_systemAuxiliaryClass              = 0x000900c6,
+                DRSUAPI_ATTID_sAMAccountName                    = 0x000900dd,
+                DRSUAPI_ATTID_sAMAccountType                    = 0x0009012e,
+                DRSUAPI_ATTID_options                           = 0x00090133,
+                DRSUAPI_ATTID_fSMORoleOwner                     = 0x00090171,
+                DRSUAPI_ATTID_systemFlags                       = 0x00090177,
+                DRSUAPI_ATTID_serverReference                   = 0x00090203,
+                DRSUAPI_ATTID_serverReferenceBL                 = 0x00090204,
+                DRSUAPI_ATTID_initialAuthIncoming               = 0x0009021b,
+                DRSUAPI_ATTID_initialAuthOutgoing               = 0x0009021c,
+                DRSUAPI_ATTID_wellKnownObjects                  = 0x0009026a,
+                DRSUAPI_ATTID_dNSHostName                       = 0x0009026b,
+                DRSUAPI_ATTID_isMemberOfPartialAttributeSet     = 0x0009027f,
+                DRSUAPI_ATTID_userPrincipalName                 = 0x00090290,
+                DRSUAPI_ATTID_groupType                         = 0x000902ee,
+                DRSUAPI_ATTID_servicePrincipalName              = 0x00090303,
+                DRSUAPI_ATTID_lastKnownParent                   = 0x0009030d,
+                DRSUAPI_ATTID_objectCategory                    = 0x0009030e,
+                DRSUAPI_ATTID_gPLink                            = 0x0009037b,
+                DRSUAPI_ATTID_transportAddressAttribute         = 0x0009037f,
+                DRSUAPI_ATTID_msDS_Behavior_Version             = 0x000905b3,
+                DRSUAPI_ATTID_msDS_KeyVersionNumber             = 0x000906f6,
+                DRSUAPI_ATTID_msDS_HasDomainNCs                 = 0x0009071c,
+                DRSUAPI_ATTID_msDS_hasMasterNCs                 = 0x0009072c,
+                DRSUAPI_ATTID_isRecycled                        = 0x0009080a,
+
+                DRSUAPI_ATTID_INVALID                           = 0xFFFFFFFF
         } drsuapi_DsAttributeId;
 
@@ -485 +490 @@
                 drsuapi_DsReplicaHighWaterMark highwatermark;
                 drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                drsuapi_DrsOptions replica_flags;
                 uint32 max_object_count; /* w2k3 uses min(133,max(100,max_object_count)) */
                 uint32 max_ndr_size; /* w2k3 seems to ignore this */
@@ -501 +506 @@
                 drsuapi_DsReplicaHighWaterMark highwatermark;
                 drsuapi_DsReplicaCursorCtrEx *uptodateness_vector;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                drsuapi_DrsOptions replica_flags;
                 uint32 max_object_count; /* w2k3 uses min(133,max(100,max_object_count)) */
                 uint32 max_ndr_size; /* w2k3 seems to ignore this */
@@ -512 +517 @@
         } drsuapi_DsGetNCChangesRequest10;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(5)] drsuapi_DsGetNCChangesRequest5 req5;
                 [case(8)] drsuapi_DsGetNCChangesRequest8 req8;
@@ -545 +550 @@
         /* DN String values */
         typedef [public,gensize] struct {
-                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->iconv_convenience, ndr->flags))] uint32 __ndr_size;
+                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3(r, ndr->flags))] uint32 __ndr_size;
                 [value(ndr_size_dom_sid28(&sid,ndr->flags))]  uint32 __ndr_size_sid;
                 GUID guid;
@@ -554 +559 @@
 
         typedef [public] struct {
-                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r, ndr->iconv_convenience, ndr->flags))] uint32 __ndr_size;
+                [value(ndr_size_drsuapi_DsReplicaObjectIdentifier3Binary_without_Binary(r, ndr->flags))] uint32 __ndr_size;
                 [value(ndr_size_dom_sid28(&sid,ndr->flags))]  uint32 __ndr_size_sid;
                 GUID guid;
@@ -564 +569 @@
         } drsuapi_DsReplicaObjectIdentifier3Binary;
 
-        typedef [public] struct {
+        typedef [public,noprint] struct {
                 drsuapi_DsAttributeId attid;
                 drsuapi_DsAttributeValueCtr value_ctr;
@@ -617 +622 @@
                 uint32 object_count;
                 /* this +55 is sometimes +56, so I don't know where this comes from... --metze */
-                [value(ndr_size_drsuapi_DsGetNCChangesCtr1(r,ndr->iconv_convenience,ndr->flags)+55)] uint32 __ndr_size;
+                [value(ndr_size_drsuapi_DsGetNCChangesCtr1(r,ndr->flags)+55)] uint32 __ndr_size;
                 drsuapi_DsReplicaObjectListItemEx *first_object;
                 boolean32 more_data;
@@ -651 +656 @@
                 uint32 object_count;
                 /* this +55 is sometimes +56, so I don't know where this comes from... --metze */
-                [value(ndr_size_drsuapi_DsGetNCChangesCtr6(r,ndr->iconv_convenience,ndr->flags)+55)] uint32 __ndr_size;
+                [value(ndr_size_drsuapi_DsGetNCChangesCtr6(r,ndr->flags)+55)] uint32 __ndr_size;
                 drsuapi_DsReplicaObjectListItemEx *first_object;
                 boolean32 more_data;
@@ -718 +723 @@
 
         typedef struct {
-                [range(0,6)] int32 level;
+                [range(0,6)] uint32 level;
                 [range(2,3)] drsuapi_DsGetNCChangesCompressionType type;
                 [switch_is(level | (type<<16))] drsuapi_DsGetNCChangesCompressedCtr ctr;
         } drsuapi_DsGetNCChangesCtr7;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetNCChangesCtr1 ctr1;
                 [case(2)] drsuapi_DsGetNCChangesCtr2 ctr2;
@@ -732 +737 @@
         WERROR drsuapi_DsGetNCChanges(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsGetNCChangesRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsGetNCChangesCtr *ctr
                 );
@@ -741 +746 @@
         /* Function 0x04 */
         /* [MS-DRSR] 4.1.26 */
-        typedef bitmap {
-                DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION        = 0x00000001,
-                DRSUAPI_DS_REPLICA_UPDATE_GETCHG_CHECK                  = 0x00000002,
-                DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE                 = 0x00000004,
-                DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE              = 0x00000008,
-                DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE                     = 0x00000010
-        } drsuapi_DsReplicaUpdateRefsOptions;
 
         typedef struct {
@@ -753 +751 @@
                 [ref,charset(DOS),string] uint8 *dest_dsa_dns_name;
                 GUID dest_dsa_guid;
-                drsuapi_DsReplicaUpdateRefsOptions options;
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaUpdateRefsRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsReplicaUpdateRefsRequest1 req1;
         } drsuapi_DsReplicaUpdateRefsRequest;
@@ -762 +760 @@
         WERROR drsuapi_DsReplicaUpdateRefs(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,switch_is(level)] drsuapi_DsReplicaUpdateRefsRequest req
                 );
@@ -768 +766 @@
         /*****************/
         /* Function 0x05 */
-        typedef bitmap {
-                DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION   = 0x00000001,
-                DRSUAPI_DS_REPLICA_ADD_WRITEABLE                = 0x00000002
-                /* TODO ... */
-        } drsuapi_DsReplicaAddOptions;
-
 
         typedef struct {
@@ -779 +771 @@
                 [charset(UTF16),string] uint16 *source_dsa_address;
                 uint8 schedule[84];
-                drsuapi_DsReplicaAddOptions options;
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaAddRequest1;
 
@@ -788 +780 @@
                 [charset(UTF16),string] uint16 *source_dsa_address;
                 uint8 schedule[84];
-                drsuapi_DsReplicaAddOptions options;
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaAddRequest2;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsReplicaAddRequest1 req1;
                 [case(2)] drsuapi_DsReplicaAddRequest2 req2;
@@ -798 +790 @@
         WERROR drsuapi_DsReplicaAdd(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,switch_is(level)] drsuapi_DsReplicaAddRequest req
                 );
@@ -805 +797 @@
         /*****************/
         /* Function 0x06 */
-        typedef bitmap {
-                DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION   = 0x00000001,
-                DRSUAPI_DS_REPLICA_ADD_WRITEABLE                = 0x00000002
-                /* TODO ... */
-        } drsuapi_DsReplicaDeleteOptions;
-
-
         typedef struct {
                 [ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
                 [charset(UTF16),string] uint16 *source_dsa_address;
-                drsuapi_DsReplicaDeleteOptions options;
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaDelRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsReplicaDelRequest1 req1;
         } drsuapi_DsReplicaDelRequest;
@@ -824 +809 @@
         WERROR drsuapi_DsReplicaDel(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,switch_is(level)] drsuapi_DsReplicaDelRequest req
                 );
@@ -830 +815 @@
         /*****************/
         /* Function 0x07 */
-        typedef bitmap {
-                DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION   = 0x00000001,
-                DRSUAPI_DS_REPLICA_ADD_WRITEABLE                = 0x00000002
-                /* TODO ... */
-        } drsuapi_DsReplicaModifyOptions;
-
 
         typedef struct {
@@ -842 +821 @@
                 [charset(UTF16),string] uint16 *source_dra_address;
                 uint8 schedule[84];
-                uint32 replica_flags;
+                drsuapi_DrsOptions replica_flags;
                 uint32 modify_fields;
-                drsuapi_DsReplicaModifyOptions options;
+                drsuapi_DrsOptions options;
         } drsuapi_DsReplicaModRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsReplicaModRequest1 req1;
         } drsuapi_DsReplicaModRequest;
@@ -853 +832 @@
         WERROR drsuapi_DsReplicaMod(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,switch_is(level)] drsuapi_DsReplicaModRequest req
                 );
@@ -884 +863 @@
         } drsuapi_DsGetMembershipsCtr1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetMembershipsCtr1 ctr1;
         } drsuapi_DsGetMembershipsCtr;
@@ -894 +873 @@
                 [size_is(count)] drsuapi_DsReplicaObjectIdentifier **info_array;
                 uint32 flags;
-                drsuapi_DsMembershipType type;
+                [range(1,7)] drsuapi_DsMembershipType type;
                 drsuapi_DsReplicaObjectIdentifier *domain;
         } drsuapi_DsGetMembershipsRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetMembershipsRequest1 req1;
         } drsuapi_DsGetMembershipsRequest;
 
-        [todo] WERROR drsuapi_DsGetMemberships(
+        WERROR drsuapi_DsGetMemberships(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref] [switch_is(level)] drsuapi_DsGetMembershipsRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref] [switch_is(*level_out)] drsuapi_DsGetMembershipsCtr *ctr
                 );
@@ -916 +895 @@
         /*****************/
         /* Function 0x0b */
-        typedef struct {
-                uint32 unknown1;
-                uint32 unknown2;
-                [range(0,0x00A00000)] uint32 length;
-                [size_is(length)] uint8 *data;
+        typedef [bitmap32bit] bitmap {
+                DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG             = 0x00000001,
+                DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS        = 0x00000002
+        } drsuapi_DsGetNT4ChangeLogFlags;
+
+        typedef struct {
+                drsuapi_DsGetNT4ChangeLogFlags flags;
+                uint32 preferred_maximum_length;
+                [range(0,0x00A00000)] uint32 restart_length;
+                [size_is(restart_length)] uint8 *restart_data;
         } drsuapi_DsGetNT4ChangeLogRequest1;
 
@@ -928 +912 @@
 
         typedef struct {
-                [range(0,0x00A00000)] uint32 length1;
-                [range(0,0x00A00000)] uint32 length2;
-                hyper unknown1;
-                NTTIME time2;
-                hyper unknown3;
-                NTTIME time4;
-                hyper unknown5;
-                NTTIME time6;
+                [range(0,0x00A00000)] uint32 restart_length;
+                [range(0,0x00A00000)] uint32 log_length;
+                hyper sam_serial_number;
+                NTTIME sam_creation_time;
+                hyper builtin_serial_number;
+                NTTIME builtin_creation_time;
+                hyper lsa_serial_number;
+                NTTIME lsa_creation_time;
                 NTSTATUS status;
-                [size_is(length1)] uint8 *data1;
-                [size_is(length2)] uint8 *data2;
+                [size_is(restart_length)] uint8 *restart_data;
+                [size_is(log_length)] uint8 *log_data;
         } drsuapi_DsGetNT4ChangeLogInfo1;
 
@@ -945 +929 @@
         } drsuapi_DsGetNT4ChangeLogInfo;
 
-        [todo] WERROR drsuapi_DsGetNT4ChangeLog(
+        WERROR drsuapi_DsGetNT4ChangeLog(
                 [in] policy_handle *bind_handle,
                 [in] uint32 level,
@@ -975 +959 @@
 
         typedef [v1_enum] enum {
-                DRSUAPI_DS_NAME_FORMAT_UNKNOWN                  = 0,
-                DRSUAPI_DS_NAME_FORMAT_FQDN_1779                = 1,
-                DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT              = 2,
-                DRSUAPI_DS_NAME_FORMAT_DISPLAY                  = 3,
-                DRSUAPI_DS_NAME_FORMAT_GUID                     = 6,
-                DRSUAPI_DS_NAME_FORMAT_CANONICAL                = 7,
-                DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL           = 8,
-                DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX             = 9,
-                DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL        = 10,
-                DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY       = 11,
-                DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN               = 12
+                DRSUAPI_DS_NAME_FORMAT_UNKNOWN                  = 0x00000000,
+                DRSUAPI_DS_NAME_FORMAT_FQDN_1779                = 0x00000001,
+                DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT              = 0x00000002,
+                DRSUAPI_DS_NAME_FORMAT_DISPLAY                  = 0x00000003,
+                DRSUAPI_DS_NAME_FORMAT_GUID                     = 0x00000006,
+                DRSUAPI_DS_NAME_FORMAT_CANONICAL                = 0x00000007,
+                DRSUAPI_DS_NAME_FORMAT_USER_PRINCIPAL           = 0x00000008,
+                DRSUAPI_DS_NAME_FORMAT_CANONICAL_EX             = 0x00000009,
+                DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL        = 0x0000000A,
+                DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY       = 0x0000000B,
+                DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN               = 0x0000000C,
+                DRSUAPI_DS_NAME_FORMAT_UPN_AND_ALTSECID         = 0xFFFFFFEF,
+                DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT_NAME_SANS_DOMAIN_EX = 0xFFFFFFF0,
+                DRSUAPI_DS_NAME_FORMAT_LIST_GLOBAL_CATALOG_SERVERS = 0xFFFFFFF1,
+                DRSUAPI_DS_NAME_FORMAT_UPN_FOR_LOGON            = 0xFFFFFFF2,
+                DRSUAPI_DS_NAME_FORMAT_LIST_SERVERS_WITH_DCS_IN_SITE = 0xFFFFFFF3,
+                DRSUAPI_DS_NAME_FORMAT_STRING_SID_NAME          = 0xFFFFFFF4,
+                DRSUAPI_DS_NAME_FORMAT_ALT_SECURITY_IDENTITIES_NAME = 0xFFFFFFF5,
+                DRSUAPI_DS_NAME_FORMAT_LIST_NCS                 = 0xFFFFFFF6,
+                DRSUAPI_DS_NAME_FORMAT_LIST_DOMAINS             = 0xFFFFFFF7,
+                DRSUAPI_DS_NAME_FORMAT_MAP_SCHEMA_GUID          = 0xFFFFFFF8,
+                DRSUAPI_DS_NAME_FORMAT_NT4_ACCOUNT_NAME_SANS_DOMAIN = 0xFFFFFFF9,
+                DRSUAPI_DS_NAME_FORMAT_LIST_ROLES               = 0xFFFFFFFA,
+                DRSUAPI_DS_NAME_FORMAT_LIST_INFO_FOR_SERVER     = 0xFFFFFFFB,
+                DRSUAPI_DS_NAME_FORMAT_LIST_SERVERS_FOR_DOMAIN_IN_SITE = 0xFFFFFFFC,
+                DRSUAPI_DS_NAME_FORMAT_LIST_DOMAINS_IN_SITE     = 0xFFFFFFFD,
+                DRSUAPI_DS_NAME_FORMAT_LIST_SERVERS_IN_SITE     = 0xFFFFFFFE,
+                DRSUAPI_DS_NAME_FORMAT_LIST_SITES               = 0xFFFFFFFF
         } drsuapi_DsNameFormat;
 
@@ -1002 +1003 @@
         } drsuapi_DsNameRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsNameRequest1 req1;
         } drsuapi_DsNameRequest;
@@ -1017 +1018 @@
         } drsuapi_DsNameCtr1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsNameCtr1 *ctr1;
         } drsuapi_DsNameCtr;
@@ -1023 +1024 @@
         WERROR drsuapi_DsCrackNames(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsNameRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsNameCtr *ctr
                 );
@@ -1045 +1046 @@
         } drsuapi_DsWriteAccountSpnRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsWriteAccountSpnRequest1 req1;
         } drsuapi_DsWriteAccountSpnRequest;
@@ -1053 +1054 @@
         } drsuapi_DsWriteAccountSpnResult1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsWriteAccountSpnResult1 res1;
         } drsuapi_DsWriteAccountSpnResult;
@@ -1059 +1060 @@
         WERROR drsuapi_DsWriteAccountSpn(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsWriteAccountSpnRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsWriteAccountSpnResult *res
                 );
@@ -1073 +1074 @@
         } drsuapi_DsRemoveDSServerRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsRemoveDSServerRequest1 req1;
         } drsuapi_DsRemoveDSServerRequest;
@@ -1081 +1082 @@
         } drsuapi_DsRemoveDSServerResult1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsRemoveDSServerResult1 res1;
         } drsuapi_DsRemoveDSServerResult;
@@ -1087 +1088 @@
         WERROR drsuapi_DsRemoveDSServer(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsRemoveDSServerRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsRemoveDSServerResult *res
                 );
@@ -1237 +1238 @@
         const char *DRSUAPI_NTDSDSA_KRB5_SERVICE_GUID = "E3514235-4B06-11D1-AB04-00C04FC2DCD2";
 
+        /* Error codes to classify an error that occurs
+         * during a search for, or the update of,
+         * a directory object */
+        typedef [v1_enum] enum {
+                DRSUAPI_DIRERR_OK         = 0,
+                DRSUAPI_DIRERR_ATTRIBUTE  = 1,
+                DRSUAPI_DIRERR_NAME       = 2,
+                DRSUAPI_DIRERR_REFERRAL   = 3,
+                DRSUAPI_DIRERR_SECURITY   = 4,
+                DRSUAPI_DIRERR_SERVICE    = 5,
+                DRSUAPI_DIRERR_UPDATE     = 6,
+                DRSUAPI_DIRERR_SYSTEM     = 7
+        } drsuapi_DsAddEntry_DirErr;
+
         /*
-         * please note the the current idl
-         * for DsAddEntry does only parse
-         * what I saw between 2 w2k3 boxes
-         * in my dssync experiments I got some other replies
-         * so all I want to say is that this is very incomplete yet...
-         * --metze
+         * Ref: DRS_MSG_ADDENTRYREQ_V2, [MS-DRSR]: 4.1.1.1.3
          */
         typedef struct {
@@ -1249 +1259 @@
         } drsuapi_DsAddEntryRequest2;
 
-        typedef [switch_type(int32)] union {
+        /* Buffer type is actually more
+         * like a semi Flags
+         * Ref: DRS_SecBuffer, [MS-DRSR]: 5.41 */
+        typedef [v1_enum,noprint] enum {
+                DRSUAPI_SECBUFFER_EMPTY          = 0x00000000,
+                DRSUAPI_SECBUFFER_DATA           = 0x00000001,
+                DRSUAPI_SECBUFFER_TOKEN          = 0x00000002,
+                DRSUAPI_SECBUFFER_PKG_PARAMS     = 0x00000003,
+                DRSUAPI_SECBUFFER_MISSING        = 0x00000004,
+                DRSUAPI_SECBUFFER_EXTRA          = 0x00000005,
+                DRSUAPI_SECBUFFER_STREAM_TRAILER = 0x00000006,
+                DRSUAPI_SECBUFFER_STREAM_HEADER  = 0x00000007,
+                DRSUAPI_SECBUFFER_READONLY       = 0x80000000
+        } drsuapi_SecBufferType;
+
+        typedef struct {
+                [range(0,10000)] uint32 buf_size;
+                drsuapi_SecBufferType buf_type;
+                [size_is(buf_size)] uint8 *buffer;
+        } drsuapi_SecBuffer;
+
+        typedef struct {
+                [value(0)] uint32 version;
+                [range(0,10000)] uint32 buff_count;
+                [size_is(buff_count)] drsuapi_SecBuffer *buffers;
+        } drsuapi_SecBufferDesc;
+
+        /*
+         * Ref: DRS_MSG_ADDENTRYREQ_V3, [MS-DRSR]: 4.1.1.1.4
+         */
+        typedef struct {
+                drsuapi_DsReplicaObjectListItem first_object;
+                drsuapi_SecBufferDesc *client_creds;
+        } drsuapi_DsAddEntryRequest3;
+
+        typedef [switch_type(uint32)] union {
                 [case(2)] drsuapi_DsAddEntryRequest2 req2;
+                [case(3)] drsuapi_DsAddEntryRequest3 req3;
         } drsuapi_DsAddEntryRequest;
 
-        typedef struct {
-                uint32 unknown1;
+        /* Generic extended error info
+         * commonly used in most places
+         * where rich error info is returned */
+        typedef struct {
+                uint32  dsid;           /* implementation-specific diagnostic code */
+                WERROR  extended_err;   /* 0, STATUS code, or Windows error code */
+                uint32  extended_data;  /* implementation-specific diagnostic code */
+                uint16  problem;        /* 0 or PROBLEM error code */
+        } drsuapi_DsAddEntryErrorInfoX;
+
+        /* Attribute errors
+         * Ref: ATRERR_DRS_WIRE_V1, [MS-DRSR]: 4.1.1.1.11 */
+        typedef struct {
+                uint32  dsid;
+                WERROR  extended_err;
+                uint32  extended_data;
+                uint16  problem;
+                drsuapi_DsAttributeId attid;
+                boolean32 is_val_returned;
+                drsuapi_DsAttributeValue attr_val;
+        } drsuapi_DsAddEntry_AttrErr_V1;
+
+        typedef [noprint] struct {
+                drsuapi_DsAddEntry_AttrErrListItem_V1 *next;
+                drsuapi_DsAddEntry_AttrErr_V1 err_data;
+        } drsuapi_DsAddEntry_AttrErrListItem_V1;
+
+        typedef struct {
+                drsuapi_DsReplicaObjectIdentifier *id;
+                uint32 count;
+                drsuapi_DsAddEntry_AttrErrListItem_V1 first;
+        } drsuapi_DsAddEntryErrorInfo_Attr_V1;
+
+        /* Name resolution error
+         * Ref: NAMERR_DRS_WIRE_V1, [MS-DRSR]: 4.1.1.1.14 */
+        typedef struct {
+                uint32  dsid;
+                WERROR  extended_err;
+                uint32  extended_data;
+                uint16  problem;
+                drsuapi_DsReplicaObjectIdentifier *id_matched; /* The best match for the supplied object identity */
+        } drsuapi_DsAddEntryErrorInfo_Name_V1;
+
+        /* Referral error
+         * Ref: REFERR_DRS_WIRE_V1, [MS-DRSR]: 4.1.1.1.15 */
+        typedef struct {
+                [value(83)] uint8  name_res;    /* Must be 'S' */
+                [value(0)]  uint8  unused_pad;
+                [value(0)]  uint16 next_rdn;
+        } drsuapi_NameResOp_V1;
+
+        typedef [enum16bit] enum {
+                DRSUAPI_CH_REFTYPE_SUPERIOR     = 0x0000, /* referral to a superior DC */
+                DRSUAPI_CH_REFTYPE_SUBORDINATE  = 0x0001, /* referral to a subordinate DC */
+                DRSUAPI_CH_REFTYPE_NSSR         = 0x0002, /* Not used */
+                DRSUAPI_CH_REFTYPE_CROSS        = 0x0003  /* A referral to an external crossRef object */
+        } drsuapi_DsAddEntry_RefType;
+
+        typedef [enum8bit] enum {
+                DRSUAPI_SE_CHOICE_BASE_ONLY     = 0x00,
+                DRSUAPI_SE_CHOICE_IMMED_CHLDRN  = 0x01,
+                DRSUAPI_SE_CHOICE_WHOLE_SUBTREE = 0x02
+        } drsuapi_DsAddEntry_ChoiceType;
+
+        /* list of network names of the DCs
+         * to which the referral is directed */
+        typedef struct  {
+                drsuapi_DsaAddressListItem_V1 *next;
+                lsa_String *address;
+        } drsuapi_DsaAddressListItem_V1;
+
+        typedef struct {
+                drsuapi_DsReplicaObjectIdentifier *id_target; /* object to which the referral is directed */
+                drsuapi_NameResOp_V1 op_state;
+                [value(0)] uint16 rdn_alias;
+                [value(0)] uint16 rdn_internal;
+                drsuapi_DsAddEntry_RefType ref_type;
+                uint16 addr_list_count;
+                drsuapi_DsaAddressListItem_V1 *addr_list;
+                drsuapi_DsAddEntry_RefErrListItem_V1 *next;
+                boolean32 is_choice_set;
+                drsuapi_DsAddEntry_ChoiceType choice;
+        } drsuapi_DsAddEntry_RefErrListItem_V1;
+
+        typedef struct {
+                uint32  dsid;
+                WERROR  extended_err;
+                uint32  extended_data;
+                drsuapi_DsAddEntry_RefErrListItem_V1 refer;
+        } drsuapi_DsAddEntryErrorInfo_Referr_V1;
+
+        typedef [switch_type(uint32)] union {
+                [case(1)] drsuapi_DsAddEntryErrorInfo_Attr_V1   attr_err;
+                [case(2)] drsuapi_DsAddEntryErrorInfo_Name_V1   name_err;
+                [case(3)] drsuapi_DsAddEntryErrorInfo_Referr_V1 referral_err;
+                [case(4)] drsuapi_DsAddEntryErrorInfoX          security_err;
+                [case(5)] drsuapi_DsAddEntryErrorInfoX          service_err;
+                [case(6)] drsuapi_DsAddEntryErrorInfoX          update_err;
+                [case(7)] drsuapi_DsAddEntryErrorInfoX          system_err;
+        } drsuapi_DsAddEntryErrorInfo;
+
+        typedef struct {
                 WERROR status;
-                uint32 unknown2;
-                uint16 unknown3;
-        } drsuapi_DsAddEntryErrorInfoX;
-
-        typedef struct {
-                [range(0,10485760)] uint32 size;
-                [size_is(size)] uint8 *data;
-        } drsuapi_DsAddEntryExtraErrorBuffer;
-
-        typedef struct {
-                drsuapi_DsAddEntryErrorInfoX error;
-                drsuapi_DsAttributeId attid;
-                uint32 unknown2;
-                drsuapi_DsAddEntryExtraErrorBuffer buffer;
-        } drsuapi_DsAddEntryExtraError1;
-
-        typedef /*[noprint]*/ struct {
-                drsuapi_DsAddEntryErrorListItem1 *next;
-                drsuapi_DsAddEntryExtraError1 error;
-        } drsuapi_DsAddEntryErrorListItem1;
-
-        typedef struct {
-                drsuapi_DsReplicaObjectIdentifier *id;
-                WERROR status;
-                drsuapi_DsAddEntryErrorListItem1 first;
-        } drsuapi_DsAddEntryErrorInfo1;
-
-        typedef [switch_type(uint32)] union {
-                [case(1)] drsuapi_DsAddEntryErrorInfo1 error1;
-/*              [case(2)] drsuapi_DsAddEntryErrorInfo2 error2;
-                [case(3)] drsuapi_DsAddEntryErrorInfo3 error3;
-*/              [case(4)] drsuapi_DsAddEntryErrorInfoX errorX;
-                [case(5)] drsuapi_DsAddEntryErrorInfoX errorX;
-                [case(6)] drsuapi_DsAddEntryErrorInfoX errorX;
-                [case(7)] drsuapi_DsAddEntryErrorInfoX errorX;
-        } drsuapi_DsAddEntryErrorInfo;
-
-        typedef struct {
-                WERROR status;
-                uint32 level;
-                [switch_is(level)] drsuapi_DsAddEntryErrorInfo *info;
-        } drsuapi_DsAddEntryError1;
-
-        typedef [switch_type(uint32)] union {
-                [case(1)] drsuapi_DsAddEntryError1 info1;
-        } drsuapi_DsAddEntryError;
+                drsuapi_DsAddEntry_DirErr dir_err;
+                [switch_is(dir_err)] drsuapi_DsAddEntryErrorInfo *info;
+        } drsuapi_DsAddEntry_ErrData_V1;
+
+        typedef [switch_type(uint32)] union {
+                [case(1)] drsuapi_DsAddEntry_ErrData_V1 v1;
+        } drsuapi_DsAddEntry_ErrData;
 
         typedef struct {
@@ -1310 +1417 @@
         typedef struct {
                 drsuapi_DsReplicaObjectIdentifier *id;
-                uint32 unknown1;
-                drsuapi_DsAddEntryErrorInfoX error;
+                drsuapi_DsAddEntry_DirErr dir_err;
+                uint32                    dsid;          /* implementation-specific diagnostic code */
+                WERROR                    extended_err;  /* 0, STATUS code, or Windows error code */
+                uint32                    extended_data; /* implementation-specific diagnostic code */
+                uint16                    problem;       /* 0 or PROBLEM error code */
                 [range(0,10000)] uint32 count;
                 [size_is(count)] drsuapi_DsReplicaObjectIdentifier2 *objects;
@@ -1318 +1428 @@
         typedef struct {
                 drsuapi_DsReplicaObjectIdentifier *id;
-                uint32 level;
-                [switch_is(level)] drsuapi_DsAddEntryError *error;
+                uint32 err_ver; /* Must be 1 */
+                [switch_is(err_ver)] drsuapi_DsAddEntry_ErrData *err_data;
                 [range(0,10000)] uint32 count;
                 [size_is(count)] drsuapi_DsReplicaObjectIdentifier2 *objects;
         } drsuapi_DsAddEntryCtr3;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(2)] drsuapi_DsAddEntryCtr2 ctr2;
                 [case(3)] drsuapi_DsAddEntryCtr3 ctr3;
@@ -1331 +1441 @@
         [public] WERROR drsuapi_DsAddEntry(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref,switch_is(level)] drsuapi_DsAddEntryRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref,switch_is(*level_out)] drsuapi_DsAddEntryCtr *ctr
                 );
@@ -1378 +1488 @@
                 DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2                   = 9,
                 DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2       = 10,
-                DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02                     = -2,
-                DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04                   = -4,
-                DRSUAPI_DS_REPLICA_INFO_CURSORS05                       = -5,
-                DRSUAPI_DS_REPLICA_INFO_06                              = -6
+                DRSUAPI_DS_REPLICA_INFO_REPSTO                          = -2,
+                DRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS                 = -4,
+                DRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1              = -5,
+                DRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS           = -6
         } drsuapi_DsReplicaInfoType;
 
@@ -1387 +1497 @@
                 drsuapi_DsReplicaInfoType info_type;
                 [charset(UTF16),string] uint16 *object_dn;
-                GUID guid1;
+                GUID source_dsa_guid;
         } drsuapi_DsReplicaGetInfoRequest1;
 
@@ -1393 +1503 @@
                 drsuapi_DsReplicaInfoType info_type;
                 [charset(UTF16),string] uint16 *object_dn;
-                GUID guid1;
-                uint32 unknown1;
-                [charset(UTF16),string] uint16 *string1;
-                [charset(UTF16),string] uint16 *string2;
-                uint32 unknown2;
+                GUID source_dsa_guid;
+                uint32 flags;
+                [charset(UTF16),string] uint16 *attribute_name;
+                [charset(UTF16),string] uint16 *value_dn_str;
+                uint32 enumeration_context;
         } drsuapi_DsReplicaGetInfoRequest2;
 
@@ -1410 +1520 @@
                 [charset(UTF16),string] uint16 *source_dsa_address;
                 [charset(UTF16),string] uint16 *transport_obj_dn;
-                drsuapi_DsReplicaNeighbourFlags replica_flags;
+                drsuapi_DrsOptions replica_flags;
                 uint32 reserved;
                 GUID naming_context_obj_guid;
@@ -1473 +1583 @@
         } drsuapi_DsReplicaOpType;
 
-        typedef [switch_type(drsuapi_DsReplicaOpType)] union {
-                [case(DRSUAPI_DS_REPLICA_OP_TYPE_SYNC)]         drsuapi_DsReplicaSyncOptions sync;
-                [case(DRSUAPI_DS_REPLICA_OP_TYPE_ADD)]          drsuapi_DsReplicaAddOptions add;
-                [case(DRSUAPI_DS_REPLICA_OP_TYPE_DELETE)]       drsuapi_DsReplicaDeleteOptions op_delete;
-                [case(DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY)]       drsuapi_DsReplicaModifyOptions modify;
-                [case(DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS)]  drsuapi_DsReplicaUpdateRefsOptions update_refs;
-                [default] uint32 unknown;
-        } drsuapi_DsRplicaOpOptions;
-
         typedef struct {
                 NTTIME operation_start;
@@ -1487 +1588 @@
                 uint32 priority;
                 drsuapi_DsReplicaOpType operation_type;
-                [switch_is(operation_type)] drsuapi_DsRplicaOpOptions options;
+                drsuapi_DrsOptions options;
                 [charset(UTF16),string] uint16 *nc_dn;
                 [charset(UTF16),string] uint16 *remote_dsa_obj_dn;
@@ -1517 +1618 @@
         typedef struct {
                 uint32 count;
-                int32 enumeration_context;
+                uint32 enumeration_context;
                 [size_is(count)] drsuapi_DsReplicaAttrValMetaData array[];
         } drsuapi_DsReplicaAttrValMetaDataCtr;
@@ -1523 +1624 @@
         typedef struct {
                 uint32 count;
-                int32 enumeration_context;
+                uint32 enumeration_context;
                 [size_is(count)] drsuapi_DsReplicaCursor2 array[];
         } drsuapi_DsReplicaCursor2Ctr;
@@ -1536 +1637 @@
         typedef struct {
                 uint32 count;
-                int32 enumeration_context;
+                uint32 enumeration_context;
                 [size_is(count)] drsuapi_DsReplicaCursor3 array[];
         } drsuapi_DsReplicaCursor3Ctr;
@@ -1552 +1653 @@
         typedef struct {
                 uint32 count;
-                int32 enumeration_context;
+                uint32 enumeration_context;
                 [size_is(count)] drsuapi_DsReplicaObjMetaData2 array[];
         } drsuapi_DsReplicaObjMetaData2Ctr;
@@ -1573 +1674 @@
         typedef struct {
                 uint32 count;
-                int32 enumeration_context;
+                uint32 enumeration_context;
                 [size_is(count)] drsuapi_DsReplicaAttrValMetaData2 array[];
         } drsuapi_DsReplicaAttrValMetaData2Ctr;
@@ -1622 +1723 @@
                 [case(DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2)] drsuapi_DsReplicaObjMetaData2Ctr *objmetadata2;
                 [case(DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2)] drsuapi_DsReplicaAttrValMetaData2Ctr *attrvalmetadata2;
-                [case(DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02)] drsuapi_DsReplicaNeighbourCtr *neighbours02;
-                [case(DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04)] drsuapi_DsReplicaConnection04Ctr *connections04;
-                [case(DRSUAPI_DS_REPLICA_INFO_CURSORS05)] drsuapi_DsReplicaCursorCtrEx *cursors05;
-                [case(DRSUAPI_DS_REPLICA_INFO_06)] drsuapi_DsReplica06Ctr *i06;
+                [case(DRSUAPI_DS_REPLICA_INFO_REPSTO)] drsuapi_DsReplicaNeighbourCtr *repsto;
+                [case(DRSUAPI_DS_REPLICA_INFO_CLIENT_CONTEXTS)] drsuapi_DsReplicaConnection04Ctr *clientctx;
+                [case(DRSUAPI_DS_REPLICA_INFO_UPTODATE_VECTOR_V1)] drsuapi_DsReplicaCursorCtrEx *udv1;
+                [case(DRSUAPI_DS_REPLICA_INFO_SERVER_OUTGOING_CALLS)] drsuapi_DsReplica06Ctr *srvoutgoingcalls;
         } drsuapi_DsReplicaInfo;
 
@@ -1648 +1749 @@
         } drsuapi_DsGetMemberships2Ctr1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetMembershipsCtr1 ctr1;
         } drsuapi_DsGetMemberships2Ctr;
@@ -1657 +1758 @@
         } drsuapi_DsGetMemberships2Request1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_DsGetMemberships2Request1 req1;
         } drsuapi_DsGetMemberships2Request;
@@ -1663 +1764 @@
         WERROR drsuapi_DsGetMemberships2(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref] [switch_is(level)] drsuapi_DsGetMemberships2Request *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref] [switch_is(*level_out)] drsuapi_DsGetMemberships2Ctr *ctr
                 );
@@ -1687 +1788 @@
                 [range(0,10000)] uint32 num_info;
                 [size_is(num_info)] drsuapi_DsSiteCostInfo *info;
-                uint32 unknown;
+                [value(0)] uint32 flags_reserved;
         } drsuapi_QuerySitesByCostCtr1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_QuerySitesByCostCtr1 ctr1;
         } drsuapi_QuerySitesByCostCtr;
@@ -1701 +1802 @@
         } drsuapi_QuerySitesByCostRequest1;
 
-        typedef [switch_type(int32)] union {
+        typedef [switch_type(uint32)] union {
                 [case(1)] drsuapi_QuerySitesByCostRequest1 req1;
         } drsuapi_QuerySitesByCostRequest;
@@ -1707 +1808 @@
         WERROR drsuapi_QuerySitesByCost(
                 [in] policy_handle *bind_handle,
-                [in] int32 level,
+                [in] uint32 level,
                 [in,ref] [switch_is(level)] drsuapi_QuerySitesByCostRequest *req,
-                [out,ref] int32 *level_out,
+                [out,ref] uint32 *level_out,
                 [out,ref] [switch_is(*level_out)] drsuapi_QuerySitesByCostCtr *ctr
         );

trunk/server/librpc/idl/epmapper.idl

@@ -31 +31 @@
         */
 
+        const int EPMAPPER_STATUS_CANT_PERFORM_OP = 0x6d8;
         const int EPMAPPER_STATUS_NO_MORE_ENTRIES = 0x16c9a0d6;
         const int EPMAPPER_STATUS_NO_MEMORY = 0x16C9A012;
         const int EPMAPPER_STATUS_OK = 0;
-
-
 
         typedef [enum8bit] enum {
@@ -217 +216 @@
 
         typedef struct {
-                [value(ndr_size_epm_tower(&tower, ndr->iconv_convenience, ndr->flags))] uint32  tower_length;
+                [value(ndr_size_epm_tower(&tower, ndr->flags))] uint32  tower_length;
                 [subcontext(4)] epm_tower tower;
         } epm_twr_t;
@@ -256 +255 @@
                 [in, size_is(num_ents)]  epm_entry_t entries[]
                 );
-    
+
+        typedef [v1_enum] enum {
+                RPC_C_EP_ALL_ELTS               = 0x00000000,
+                RPC_C_EP_MATCH_BY_IF            = 0x00000001,
+                RPC_C_EP_MATCH_BY_OBJ           = 0x00000002,
+                RPC_C_EP_MATCH_BY_BOTH          = 0x00000003
+        } epm_InquiryType;
+
+        typedef [v1_enum] enum {
+                RPC_C_VERS_ALL                  = 0x00000000,
+                RPC_C_VERS_COMPATIBLE           = 0x00000001,
+                RPC_C_VERS_EXACT                = 0x00000002,
+                RPC_C_VERS_MAJOR_ONLY           = 0x00000003,
+                RPC_C_VERS_UPTO                 = 0x00000004
+        } epm_VersionOption;
+
         /**********************/
         /* Function 0x02      */
         error_status_t epm_Lookup(
-                [in]            uint32          inquiry_type,
-                [in,ptr]       GUID            *object,
-                [in,ptr]       rpc_if_id_t     *interface_id,
-                [in]            uint32          vers_option,
-                [in,out]        policy_handle   *entry_handle,
-                [in]            uint32          max_ents,
-                [out]           uint32          *num_ents,
+                [in]            epm_InquiryType    inquiry_type,
+                [in,ptr]        GUID               *object,
+                [in,ptr]        rpc_if_id_t        *interface_id,
+                [in]            epm_VersionOption  vers_option,
+                [in,out]        policy_handle      *entry_handle,
+                [in]            uint32             max_ents,
+                [out]           uint32             *num_ents,
                 [out, length_is(*num_ents), size_is(max_ents)]  epm_entry_t entries[]
                 );

trunk/server/librpc/idl/frsrpc.idl

@@ -339 +339 @@
                 [value(pkt_len+12)] uint32 memory_len;
                 [value(ndr_size_frsrpc_CommPktChunkCtr(r->ctr,
-                        ndr->iconv_convenience, ndr->flags))]
+                        ndr->flags))]
                 [range(0, 262144)]
                         uint32 pkt_len;

trunk/server/librpc/idl/frstrans.idl

@@ -278 +278 @@
         /*****************/
         /* Function 0x0f */
-        [todo] void FRSTRANS_RAW_GET_FILE_DATA_ASYNC();
+        typedef pipe uint8 frstrans_BytePipe;
+
+        WERROR frstrans_RawGetFileDataAsync(
+                [in,ref] policy_handle *server_context,
+                [out,ref] frstrans_BytePipe *byte_pipe
+                );
 
         /*****************/
         /* Function 0x10 */
-        [todo] void FRSTRANS_RDC_GET_FILE_DATA_ASYNC();
+        WERROR frstrans_RdcGetFileDataAsync(
+                [in,ref] policy_handle *server_context,
+                [out,ref] frstrans_BytePipe *byte_pipe
+                );
 }

trunk/server/librpc/idl/idl_types.h

@@ -14 +14 @@
 */
 #define nstring         [flag(STR_NULLTERM|NDR_ALIGN2)] string
-
-/*
-  an ascii string prefixed with [offset] [length], both 32 bits
-  null terminated
-*/
-#define ascstr2         [flag(STR_ASCII|STR_LEN4)] string
-
-/*
-  an ascii string prefixed with [size], 32 bits
-*/
-#define asclstr         [flag(STR_ASCII|STR_SIZE4)] string
-
-/*
-  an ascii string prefixed with [size], 16 bits
-  null terminated
-*/
-#define ascstr3         [flag(STR_ASCII|STR_SIZE2)] string
-
-/*
-  an ascii string prefixed with [size] [offset] [length], all 32 bits
-  not null terminated
-*/
-#define ascstr_noterm   [flag(STR_NOTERM|STR_ASCII|STR_SIZE4|STR_LEN4)] string
 
 /*

trunk/server/librpc/idl/krb5pac.idl

@@ -123 +123 @@
                 );
 
+        void decode_login_info_ctr(
+                [in] PAC_LOGON_INFO_CTR logon_info_ctr
+                );
+
         void decode_pac_validate(
                 [in] PAC_Validate pac_validate

trunk/server/librpc/idl/lsa.idl

@@ -114 +114 @@
         /* Function: 0x06 */
         typedef struct {
-                uint32  len; /* ignored */
+                uint3264  len; /* ignored */
                 uint16  impersonation_level;
                 uint8   context_mode;
@@ -121 +121 @@
 
         typedef struct {
-                uint32 len; /* ignored */
+                uint3264 len; /* ignored */
                 uint8 *root_dir;
                 [string,charset(UTF16)] uint16 *object_name;
@@ -520 +520 @@
 
         const int LSA_REF_DOMAIN_LIST_MULTIPLIER = 32;
-        typedef struct {
+        typedef [public] struct {
                 [range(0,1000)] uint32 count;
                 [size_is(count)] lsa_DomainInfo *domains;
@@ -534 +534 @@
          */
 
-        typedef enum {
+        typedef [public] enum {
                 LSA_LOOKUP_NAMES_ALL = 1,
                 LSA_LOOKUP_NAMES_DOMAINS_ONLY = 2,
@@ -564 +564 @@
         } lsa_TranslatedName;
 
-        typedef struct {
+        typedef [public] struct {
                 [range(0,20480)] uint32 count;
                 [size_is(count)] lsa_TranslatedName *names;
@@ -640 +640 @@
         [todo] NTSTATUS lsa_SetQuotasForAccount();
 
-        typedef [bitmap32bit] bitmap {
-                LSA_POLICY_MODE_INTERACTIVE             = 0x00000001,
-                LSA_POLICY_MODE_NETWORK                 = 0x00000002,
-                LSA_POLICY_MODE_BATCH                   = 0x00000004,
-                LSA_POLICY_MODE_SERVICE                 = 0x00000010,
-                LSA_POLICY_MODE_PROXY                   = 0x00000020,
-                LSA_POLICY_MODE_DENY_INTERACTIVE        = 0x00000040,
-                LSA_POLICY_MODE_DENY_NETWORK            = 0x00000080,
-                LSA_POLICY_MODE_DENY_BATCH              = 0x00000100,
-                LSA_POLICY_MODE_DENY_SERVICE            = 0x00000200,
-                LSA_POLICY_MODE_REMOTE_INTERACTIVE      = 0x00000400,
-                LSA_POLICY_MODE_DENY_REMOTE_INTERACTIVE = 0x00000800,
-                LSA_POLICY_MODE_ALL                     = 0x00000FF7,
-                LSA_POLICY_MODE_ALL_NT4                 = 0x00000037
-        } lsa_SystemAccessModeFlags;
-
         /* Function:    0x17 */
         NTSTATUS lsa_GetSystemAccessAccount(
@@ -677 +661 @@
 
         typedef [flag(NDR_PAHEX)] struct {
-                uint32 length;
-                uint32 size;
+                uint3264 length;
+                uint3264 size;
                 [size_is(size),length_is(length)] uint8 *data;
         } lsa_DATA_BUF;
@@ -771 +755 @@
         } lsa_TrustDomainInfoBuffer;
 
-        typedef struct {
+        typedef [public] struct {
                 uint32 incoming_count;
                 lsa_TrustDomainInfoBuffer *incoming_current_auth_info;
@@ -1041 +1025 @@
         /**********************/
         /* Function 0x31 */
-        NTSTATUS lsa_SetTrustedDomainInfoByName(
+        [public] NTSTATUS lsa_SetTrustedDomainInfoByName(
                 [in]                   policy_handle         *handle,
-                [in]                   lsa_String             trusted_domain,
+                [in,ref]               lsa_String             *trusted_domain,
                 [in]                   lsa_TrustDomInfoEnum   level,
-                [in,unique,switch_is(level)] lsa_TrustedDomainInfo *info
+                [in,ref,switch_is(level)] lsa_TrustedDomainInfo *info
                 );
 
@@ -1070 +1054 @@
                 [in]  lsa_TrustDomainInfoInfoEx   *info,
                 [in]  lsa_TrustDomainInfoAuthInfoInternal *auth_info,
-                [in]  uint32 access_mask,
+                [in]  lsa_TrustedAccessMask access_mask,
                 [out] policy_handle               *trustdom_handle
                 );
@@ -1081 +1065 @@
 
         /* Function 0x35 */
+        typedef [bitmap32bit] bitmap {
+                LSA_POLICY_KERBEROS_VALIDATE_CLIENT = 0x00000080
+        } lsa_krbAuthenticationOptions;
 
         /* w2k3 returns either 0x000bbbd000000000 or 0x000a48e800000000
-           for unknown6 - gd */
-        typedef struct {
-                uint32 enforce_restrictions;
+           for reserved - gd */
+        typedef struct {
+                lsa_krbAuthenticationOptions authentication_options;
                 hyper service_tkt_lifetime;
                 hyper user_tkt_lifetime;
                 hyper user_tkt_renewaltime;
                 hyper clock_skew;
-                hyper unknown6;
+                hyper reserved;
         } lsa_DomainInfoKerberos;
 
@@ -1126 +1113 @@
                 [in]     policy_handle *handle,
                 [in]         lsa_String     name,
-                [in]         uint32         access_mask,
+                [in]     lsa_TrustedAccessMask access_mask,
                 [out]    policy_handle *trustdom_handle
                 );
@@ -1201 +1188 @@
                 [in]  lsa_TrustDomainInfoInfoEx   *info,
                 [in]  lsa_TrustDomainInfoAuthInfoInternal *auth_info,
-                [in]  uint32                       access_mask,
+                [in]  lsa_TrustedAccessMask access_mask,
                 [out] policy_handle               *trustdom_handle
                 );
@@ -1269 +1256 @@
         /* Function 0x49 */
         typedef struct {
-                [range(0,131072)] uint32 length;
+                [range(0,131072)] uint3264 length;
                 [size_is(length)] uint8 *data;
         } lsa_ForestTrustBinaryData;
@@ -1280 +1267 @@
 
         typedef [switch_type(uint32)] union {
-                [case(LSA_FOREST_TRUST_TOP_LEVEL_NAME)] lsa_String top_level_name;
+                [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;
                 [case(LSA_FOREST_TRUST_DOMAIN_INFO)] lsa_ForestTrustDomainInfo domain_info;
@@ -1295 +1282 @@
         typedef struct {
                 uint32 flags;
-                lsa_ForestTrustRecordType level;
-                hyper unknown;
-                [switch_is(level)] lsa_ForestTrustData forest_trust_data;
+                lsa_ForestTrustRecordType type;
+                hyper time;
+                [switch_is(type)] lsa_ForestTrustData forest_trust_data;
         } lsa_ForestTrustRecord;
 
@@ -1312 +1299 @@
                 );
 
-        /* Function 0x4a */
-        [todo] NTSTATUS lsa_LSARSETFORESTTRUSTINFORMATION();
+        /*****************
+         * Function 0x4a */
+
+        typedef [v1_enum] enum {
+                LSA_FOREST_TRUST_COLLISION_TDO = 0,
+                LSA_FOREST_TRUST_COLLISION_XREF = 1,
+                LSA_FOREST_TRUST_COLLISION_OTHER = 2
+        } 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 {
+                uint32 index;
+                lsa_ForestTrustCollisionRecordType type;
+                [switch_is(type)] lsa_ForestTrustCollisionFlags flags;
+                lsa_String name;
+        } lsa_ForestTrustCollisionRecord;
+
+        typedef struct {
+                uint32 count;
+                [size_is(count)] lsa_ForestTrustCollisionRecord **entries;
+        } lsa_ForestTrustCollisionInfo;
+
+        [public] NTSTATUS lsa_lsaRSetForestTrustInformation(
+                [in]      policy_handle *handle,
+                [in,ref]  lsa_StringLarge *trusted_domain_name,
+                [in]      uint16 highest_record_type,
+                [in,ref]  lsa_ForestTrustInformation *forest_trust_info,
+                [in]      uint8 check_only,
+                [out,ref] lsa_ForestTrustCollisionInfo **collision_info
+                );
 
         /* Function 0x4b */

trunk/server/librpc/idl/mgmt.idl

@@ -71 +71 @@
                 [in]        uint32                  authn_proto,
                 [in]        uint32                  princ_name_size,
-                [out]       [string,charset(DOS)] uint8 princ_name[]
+                [out]       [string,size_is(princ_name_size),charset(DOS)] uint8 princ_name[]
                 );
 }

trunk/server/librpc/idl/misc.idl

@@ -22 +22 @@
         typedef [public] struct {
                 GUID uuid;
+                /* The major version is encoded in the 16 least significant bits, 
+                   the minor in the 16 most significant bits.  
+                   http://www.opengroup.org/onlinepubs/9629399/chap12.htm */
                 uint32 if_version;
         } ndr_syntax_id;
@@ -35 +38 @@
         typedef [public] enum {
                 SEC_CHAN_NULL        = 0,
+                SEC_CHAN_LOCAL       = 1,
                 SEC_CHAN_WKSTA       = 2,
                 SEC_CHAN_DNS_DOMAIN  = 3,
                 SEC_CHAN_DOMAIN      = 4,
-                SEC_CHAN_BDC         = 6
+                SEC_CHAN_LANMAN      = 5,
+                SEC_CHAN_BDC         = 6,
+                SEC_CHAN_RODC        = 7
         } netr_SchannelType;
 

trunk/server/librpc/idl/named_pipe_auth.idl

@@ -4 +4 @@
 */
 
-import "netlogon.idl";
+import "netlogon.idl", "security.idl", "auth.idl";
 
 [
@@ -20 +20 @@
                 [charset(DOS),string] uint8 *server_addr;
                 uint16 server_port;
-                netr_SamInfo3 *sam_info3;
-                uint32 session_key_length;
-                [size_is(session_key_length)] uint8 *session_key;
-        } named_pipe_auth_req_info2;
-
-        typedef struct {
-                [charset(UTF8),string] uint8 *client_name;
-                [charset(DOS),string] uint8 *client_addr;
-                uint16 client_port;
-                [charset(UTF8),string] uint8 *server_name;
-                [charset(DOS),string] uint8 *server_addr;
-                uint16 server_port;
-                netr_SamInfo3 *sam_info3;
-                uint32 session_key_length;
-                [size_is(session_key_length)] uint8 *session_key;
-                uint32 gssapi_delegated_creds_length;
-                [size_is(gssapi_delegated_creds_length)]
-                        uint8 *gssapi_delegated_creds;
-        } named_pipe_auth_req_info3;
+                auth_session_info_transport *session_info;
+        } named_pipe_auth_req_info4;
 
         typedef [switch_type(uint32)] union {
-                [case(0)] ;/* anonymous */
-                [case(1)] netr_SamInfo3 info1;
-                [case(2)] named_pipe_auth_req_info2 info2;
-                [case(3)] named_pipe_auth_req_info3 info3;
+                [case(4)] named_pipe_auth_req_info4 info4;
         } named_pipe_auth_req_info;
 
         typedef [public,gensize] struct {
                 [flag(NDR_BIG_ENDIAN),
-                 value(ndr_size_named_pipe_auth_req(r,ndr->iconv_convenience,ndr->flags)-4)]
+                 value(ndr_size_named_pipe_auth_req(r,ndr->flags)-4)]
                         uint32 length;
                 [charset(DOS),value(NAMED_PIPE_AUTH_MAGIC)] uint8 magic[4];
@@ -60 +40 @@
                 uint16 device_state;
                 hyper allocation_size;
-        } named_pipe_auth_rep_info2;
-
-        typedef struct {
-                uint16 file_type;
-                uint16 device_state;
-                hyper allocation_size;
-        } named_pipe_auth_rep_info3;
+        } named_pipe_auth_rep_info4;
 
         typedef [switch_type(uint32)] union {
-                [case(0)] ;
-                [case(1)] ;
-                [case(2)] named_pipe_auth_rep_info2 info2;
-                [case(3)] named_pipe_auth_rep_info3 info3;
+                [case(4)] named_pipe_auth_rep_info4 info4;
         } named_pipe_auth_rep_info;
 
         typedef [public,gensize] struct {
                 [flag(NDR_BIG_ENDIAN),
-                 value(ndr_size_named_pipe_auth_rep(r,ndr->iconv_convenience,ndr->flags)-4)]
+                 value(ndr_size_named_pipe_auth_rep(r,ndr->flags)-4)]
                         uint32 length;
                 [charset(DOS),value(NAMED_PIPE_AUTH_MAGIC)] uint8 magic[4];

trunk/server/librpc/idl/nbt.idl

@@ -11 +11 @@
 import "misc.idl", "security.idl", "svcctl.idl", "samr.idl";
 [
-        helper("../libcli/netlogon.h", "../libcli/nbt/libnbt.h")
+        helper("../libcli/netlogon/netlogon.h", "../libcli/nbt/libnbt.h"),
+        helpstring("NBT messages"),
+        uuid("6def41b6-86e4-4c32-997c-ed33af7bcd8e")
 ]
 interface nbt
@@ -24 +26 @@
                 NBT_FLAG_RECURSION_DESIRED  = 0x0100,
                 NBT_FLAG_TRUNCATION         = 0x0200,
-                NBT_FLAG_AUTHORITIVE        = 0x0400,
+                NBT_FLAG_AUTHORITATIVE      = 0x0400,
                 NBT_OPCODE                  = 0x7800,
                 NBT_FLAG_REPLY              = 0x8000
@@ -358 +360 @@
                 NBT_SERVER_SELECT_SECRET_DOMAIN_6       = 0x00000800,
                 NBT_SERVER_FULL_SECRET_DOMAIN_6         = 0x00001000,
-                NBT_SERVER_DNS_FOREST                   = 0x01000000
+                NBT_SERVER_ADS_WEB_SERVICE              = 0x00002000,
+                NBT_SERVER_HAS_DNS_NAME                 = 0x20000000,
+                NBT_SERVER_IS_DEFAULT_NC                = 0x40000000,
+                NBT_SERVER_FOREST_ROOT                  = 0x80000000
         } nbt_server_type;
 
@@ -367 +372 @@
                 NETLOGON_NT_VERSION_5EX_WITH_IP         = 0x00000008,
                 NETLOGON_NT_VERSION_WITH_CLOSEST_SITE   = 0x00000010,
-                NETLOGON_NT_VERSION_AVIOD_NT4EMUL       = 0x01000000,
+                NETLOGON_NT_VERSION_AVOID_NT4EMUL       = 0x01000000,
                 NETLOGON_NT_VERSION_PDC                 = 0x10000000,
                 NETLOGON_NT_VERSION_IP                  = 0x20000000,
@@ -375 +380 @@
 
         typedef [enum16bit,public] enum {
+                LOGON_REQUEST                     = 0,
+                LOGON_RESPONSE2                   = 6,
                 LOGON_PRIMARY_QUERY               = 7,  /* Was also NETLOGON_QUERY_FOR_PDC */
                 NETLOGON_ANNOUNCE_UAS             = 10,
@@ -411 +418 @@
         } NETLOGON_SAM_LOGON_REQUEST;
 
+        typedef struct {
+                astring              computer_name;
+                astring              user_name;
+                astring              mailslot_name;
+                uint8                request_count;
+                uint16               lmnt_token;
+                uint16               lm20_token;
+        } NETLOGON_LOGON_REQUEST;
+
         typedef [flag(NDR_NOALIGN),public] struct {
                 netlogon_command command;
-                nstring              server;
+                nstring              pdc_name;
                 nstring              user_name;
-                nstring              domain;
+                nstring              domain_name;
                 netlogon_nt_version_flags               nt_version;
                 uint16               lmnt_token;
@@ -449 +465 @@
                 nbt_string           dns_domain;
                 nbt_string           pdc_dns_name;
-                nbt_string           domain;
+                nbt_string           domain_name;
                 nbt_string           pdc_name;
                 nbt_string           user_name;
@@ -456 +472 @@
 
                 /* Optional on NETLOGON_NT_VERSION_5EX_WITH_IP */
-                [value(ndr_size_nbt_sockaddr(&sockaddr, ndr->iconv_convenience, ndr->flags))] uint8 sockaddr_size;
+                [value(ndr_size_nbt_sockaddr(&sockaddr, ndr->flags))] uint8 sockaddr_size;
                 [subcontext(0),subcontext_size(sockaddr_size)] nbt_sockaddr sockaddr;
 
@@ -479 +495 @@
 
         /* response from pdc */
-        typedef [flag(NDR_NOALIGN),public] struct {
+        typedef [public] struct {
                 netlogon_command command;
                 astring pdc_name;
@@ -489 +505 @@
                 uint16               lm20_token;
         } nbt_netlogon_response_from_pdc;
+
+        typedef [flag(NDR_NOALIGN),public] struct {
+                netlogon_command command;
+                astring pdc_name;
+                uint16 lm20_token;
+        } nbt_netlogon_response2;
 
         typedef enum netr_SamDatabaseID netr_SamDatabaseID;
@@ -518 +540 @@
 
         typedef [nodiscriminant] union {
+                [case(LOGON_REQUEST)]  NETLOGON_LOGON_REQUEST logon0;
                 [case(LOGON_SAM_LOGON_REQUEST)]       NETLOGON_SAM_LOGON_REQUEST logon;
                 [case(LOGON_PRIMARY_QUERY)] nbt_netlogon_query_for_pdc pdc;
@@ -539 +562 @@
                 [switch_is(command)] nbt_netlogon_request req;
         } nbt_netlogon_packet;
+
+        void decode_nbt_netlogon_packet(
+                [in] nbt_netlogon_packet packet
+                );
 
         /********************************************************/

trunk/server/librpc/idl/netlogon.idl

@@ -5 +5 @@
 */
 
-import "misc.idl", "lsa.idl", "samr.idl", "security.idl", "nbt.idl";
+import "misc.idl", "lsa.idl", "samr.idl", "security.idl";
 
 #include "idl_types.h"
@@ -17 +17 @@
   endpoint("ncacn_np:[\\pipe\\netlogon]","ncacn_ip_tcp:","ncalrpc:"),
   helper("../librpc/ndr/ndr_netlogon.h"),
+  ms_union,
   pointer_default(unique)
 ]
@@ -180 +181 @@
                 [case(NetlogonNetworkTransitiveInformation)]     netr_NetworkInfo  *network;
                 [case(NetlogonServiceTransitiveInformation)]     netr_PasswordInfo *password;
+                [default];
         } netr_LogonLevel;
 
@@ -252 +254 @@
                 uint32 sidcount;
                 [size_is(sidcount)] netr_SidAttr *sids;
-                lsa_String forest;
+                lsa_String dns_domainname;
                 lsa_String principle;
                 uint32 unknown4[20];
@@ -292 +294 @@
                 [case(NetlogonValidationGenericInfo2)] netr_GenericInfo2  *generic;
                 [case(NetlogonValidationSamInfo4)] netr_SamInfo6 *sam6;
+                [default];
         } netr_Validation;
 
@@ -303 +306 @@
         } netr_Authenticator;
 
-        NTSTATUS netr_LogonSamLogon(
+        [public] NTSTATUS netr_LogonSamLogon(
                 [in,unique] [string,charset(UTF16)] uint16 *server_name,
                 [in,unique] [string,charset(UTF16)] uint16 *computer_name,
@@ -603 +606 @@
 
         typedef struct {
-                uint16 unknown;
-        } netr_DELTA_DELETE_TRUST;
-
-        typedef struct {
                 uint32 privilege_entries;
                 uint32 privilege_control;
@@ -624 +623 @@
                 uint32 unknown8;
         } netr_DELTA_ACCOUNT;
-
-        typedef struct {
-                uint16 unknown;
-        } netr_DELTA_DELETE_ACCOUNT;
-
-        typedef struct {
-                uint16 unknown;
-        } netr_DELTA_DELETE_SECRET;
 
         typedef struct {
@@ -695 +686 @@
                 [case(NETR_DELTA_ALIAS_MEMBER)]    netr_DELTA_ALIAS_MEMBER    *alias_member;
                 [case(NETR_DELTA_POLICY)]          netr_DELTA_POLICY          *policy;
-                [case(NETR_DELTA_TRUSTED_DOMAIN)]  netr_DELTA_TRUSTED_DOMAIN   *trusted_domain;
-                [case(NETR_DELTA_DELETE_TRUST)]    netr_DELTA_DELETE_TRUST     delete_trust;
+                [case(NETR_DELTA_TRUSTED_DOMAIN)]  netr_DELTA_TRUSTED_DOMAIN  *trusted_domain;
+                [case(NETR_DELTA_DELETE_TRUST)]    ; /* sid only */
                 [case(NETR_DELTA_ACCOUNT)]         netr_DELTA_ACCOUNT         *account;
-                [case(NETR_DELTA_DELETE_ACCOUNT)]  netr_DELTA_DELETE_ACCOUNT   delete_account;
+                [case(NETR_DELTA_DELETE_ACCOUNT)]  ; /* sid only */
                 [case(NETR_DELTA_SECRET)]          netr_DELTA_SECRET          *secret;
-                [case(NETR_DELTA_DELETE_SECRET)]   netr_DELTA_DELETE_SECRET    delete_secret;
+                [case(NETR_DELTA_DELETE_SECRET)]   ; /* name only */
                 [case(NETR_DELTA_DELETE_GROUP2)]   netr_DELTA_DELETE_USER     *delete_group;
                 [case(NETR_DELTA_DELETE_USER2)]    netr_DELTA_DELETE_USER     *delete_user;
                 [case(NETR_DELTA_MODIFY_COUNT)]    udlong                     *modified_count;
+                [default];
         } netr_DELTA_UNION;
 
@@ -729 +721 @@
                 [case(NETR_DELTA_DELETE_USER2)]    uint32 rid;
                 [case(NETR_DELTA_MODIFY_COUNT)]    ;
+                [default];
         } netr_DELTA_ID_UNION;
 
@@ -1050 +1043 @@
                 [in]     netr_Authenticator *credential,
                 [in,out,ref] netr_Authenticator *return_authenticator,
-                [in]     [subcontext(4),subcontext_size(change_log_entry_size)] netr_ChangeLogEntry change_log_entry,
-                [in]     [value(ndr_size_netr_ChangeLogEntry(&change_log_entry, ndr->iconv_convenience, ndr->flags))] uint32 change_log_entry_size,
+                /*
+                 * we cannot use subcontext_size() here, as
+                 * change_log_entry_size is encoded after the subcontext
+                 */
+                [in]     [subcontext(4)/*,subcontext_size(change_log_entry_size)*/]
+                        netr_ChangeLogEntry change_log_entry,
+                [in]     [value(ndr_size_netr_ChangeLogEntry(&change_log_entry,
+                                ndr->flags))]
+                        uint32 change_log_entry_size,
                 [out,ref]    netr_DELTA_ENUM_ARRAY **delta_enum_array
                 );
@@ -1074 +1074 @@
         } netr_Blob;
 
-        WERROR netr_NetrEnumerateTrustedDomains(
+        NTSTATUS netr_NetrEnumerateTrustedDomains(
                 [in,unique] [string,charset(UTF16)] uint16 *server_name,
                 [out,ref] netr_Blob *trusted_domains_blob
@@ -1099 +1099 @@
                                          DS_IS_FLAT_NAME |
                                          DS_IS_DNS_NAME |
+                                         DS_TRY_NEXTCLOSEST_SITE |
+                                         DS_DIRECTORY_SERVICE_6_REQUIRED |
+                                         DS_WEB_SERVICE_REQUIRED |
                                          DS_RETURN_FLAT_NAME |
                                          DS_RETURN_DNS_NAME);
@@ -1131 +1134 @@
 
         typedef [bitmap32bit] bitmap {
-                DS_SERVER_PDC                    = NBT_SERVER_PDC,
-                DS_SERVER_GC                     = NBT_SERVER_GC,
-                DS_SERVER_LDAP                   = NBT_SERVER_LDAP,
-                DS_SERVER_DS                     = NBT_SERVER_DS,
-                DS_SERVER_KDC                    = NBT_SERVER_KDC,
-                DS_SERVER_TIMESERV               = NBT_SERVER_TIMESERV,
-                DS_SERVER_CLOSEST                = NBT_SERVER_CLOSEST,
-                DS_SERVER_WRITABLE               = NBT_SERVER_WRITABLE,
-                DS_SERVER_GOOD_TIMESERV          = NBT_SERVER_GOOD_TIMESERV,
-                DS_SERVER_NDNC                   = NBT_SERVER_NDNC,
-                DS_SERVER_SELECT_SECRET_DOMAIN_6 = NBT_SERVER_SELECT_SECRET_DOMAIN_6,
-                DS_SERVER_FULL_SECRET_DOMAIN_6   = NBT_SERVER_FULL_SECRET_DOMAIN_6,
+                DS_SERVER_PDC                    = 0x00000001,
+                DS_SERVER_GC                     = 0x00000004,
+                DS_SERVER_LDAP                   = 0x00000008,
+                DS_SERVER_DS                     = 0x00000010,
+                DS_SERVER_KDC                    = 0x00000020,
+                DS_SERVER_TIMESERV               = 0x00000040,
+                DS_SERVER_CLOSEST                = 0x00000080,
+                DS_SERVER_WRITABLE               = 0x00000100,
+                DS_SERVER_GOOD_TIMESERV          = 0x00000200,
+                DS_SERVER_NDNC                   = 0x00000400,
+                DS_SERVER_SELECT_SECRET_DOMAIN_6 = 0x00000800,
+                DS_SERVER_FULL_SECRET_DOMAIN_6   = 0x00001000,
                 DS_DNS_CONTROLLER                = 0x20000000,
                 DS_DNS_DOMAIN                    = 0x40000000,
-                DS_DNS_FOREST                    = 0x80000000
+                DS_DNS_FOREST_ROOT               = 0x80000000
         } netr_DsR_DcFlags;
 
@@ -1621 +1624 @@
         /****************/
         /* Function 0x2c */
-        WERROR netr_GetForestTrustInformation(
-                [in,unique] [string,charset(UTF16)] uint16 *server_name,
-                [in,ref] [string,charset(UTF16)] uint16 *trusted_domain_name,
+        NTSTATUS netr_GetForestTrustInformation(
+                [in,unique] [string,charset(UTF16)] uint16 *server_name,
+                [in,ref] [string,charset(UTF16)] uint16 *computer_name,
                 [in,ref] netr_Authenticator *credential,
                 [out,ref] netr_Authenticator *return_authenticator,
@@ -1668 +1671 @@
                 [out,ref] netr_TrustInfo **trust_info
                 );
+
+        /****************/
+        /* Function 0x2f */
+
+        NTSTATUS netr_Unused47(void);
+
+
+        /****************/
+        /* Function 0x30 */
+
+        typedef enum {
+                NlDnsLdapAtSite       = 22,
+                NlDnsGcAtSite         = 25,
+                NlDnsDsaCname         = 28,
+                NlDnsKdcAtSite        = 30,
+                NlDnsDcAtSite         = 32,
+                NlDnsRfc1510KdcAtSite = 34,
+                NlDnsGenericGcAtSite  = 36
+        } netr_DnsType;
+
+        typedef enum {
+                NlDnsInfoTypeNone    = 0,
+                NlDnsDomainName      = 1,
+                NlDnsDomainNameAlias = 2,
+                NlDnsForestName      = 3,
+                NlDnsForestNameAlias = 4,
+                NlDnsNdncDomainName  = 5,
+                NlDnsRecordName      = 6
+        } netr_DnsDomainInfoType;
+
+        typedef struct {
+                netr_DnsType type;
+                [string,charset(UTF16)] uint16 *dns_domain_info;
+                netr_DnsDomainInfoType dns_domain_info_type;
+                uint32 priority;
+                uint32 weight;
+                uint32 port;
+                boolean32 dns_register;
+                uint32 status;
+        } NL_DNS_NAME_INFO;
+
+        typedef [public] struct {
+                uint32 count;
+                [size_is(count)] NL_DNS_NAME_INFO *names;
+        } NL_DNS_NAME_INFO_ARRAY;
+
+        NTSTATUS netr_DsrUpdateReadOnlyServerDnsRecords(
+                [in,unique] [string,charset(UTF16)] uint16 *server_name,
+                [in,ref] [string,charset(UTF16)] uint16 *computer_name,
+                [in, ref] netr_Authenticator *credential,
+                [out,ref]   netr_Authenticator *return_authenticator,
+                [in,unique] [string,charset(UTF16)] uint16 *site_name,
+                [in] uint32 dns_ttl,
+                [in,out,ref] NL_DNS_NAME_INFO_ARRAY *dns_names
+                );
 }

trunk/server/librpc/idl/ntlmssp.idl

@@ -87 +87 @@
         /* [MS-NLMP] 2.2.2.10 VERSION */
 
-        typedef struct {
+        typedef [public] struct {
                 ntlmssp_WindowsMajorVersion ProductMajorVersion;
                 ntlmssp_WindowsMinorVersion ProductMinorVersion;
@@ -93 +93 @@
                 uint8 Reserved[3];
                 ntlmssp_NTLMRevisionCurrent NTLMRevisionCurrent;
-        } VERSION;
+        } ntlmssp_VERSION;
 
         typedef [noprint,nodiscriminant] union {
-                [case(NTLMSSP_NEGOTIATE_VERSION)] VERSION version;
+                [case(NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_VERSION version;
                 [default];
         } ntlmssp_Version;
@@ -106 +106 @@
                 [value(NtLmNegotiate)] ntlmssp_MessageType MessageType;
                 NEGOTIATE NegotiateFlags;
-                [value(strlen(DomainName))] uint16 DomainNameLen;
+                [value(DomainName ? strlen(DomainName) : 0)] uint16 DomainNameLen;
                 [value(DomainNameLen)] uint16 DomainNameMaxLen;
                 [relative] [subcontext(0),subcontext_size(DomainNameLen)] [flag(ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM))] string *DomainName;
-                [value(strlen(Workstation))] uint16 WorkstationLen;
+                [value(Workstation ? strlen(Workstation) : 0)] uint16 WorkstationLen;
                 [value(WorkstationLen)] uint16 WorkstationMaxLen;
                 [relative] [subcontext(0),subcontext_size(WorkstationLen)] [flag(ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM))] string *Workstation;
@@ -163 +163 @@
         typedef [public,flag(NDR_NOALIGN)] struct {
                 ntlmssp_AvId AvId;
-                [value(ndr_size_ntlmssp_AvValue(&r->Value, r->AvId, ndr->iconv_convenience, 0))] uint16 AvLen;
+                [value(ndr_size_ntlmssp_AvValue(&r->Value, r->AvId, 0))] uint16 AvLen;
                 [subcontext(0),subcontext_size(AvLen),switch_is(AvId)] ntlmssp_AvValue Value;
         } AV_PAIR;
@@ -183 +183 @@
                 uint8 ServerChallenge[8];
                 uint8 Reserved[8];
-                [value(ndr_size_AV_PAIR_LIST(TargetInfo, ndr->iconv_convenience, ndr->flags))] uint16 TargetInfoLen;
+                [value(ndr_size_AV_PAIR_LIST(TargetInfo, ndr->flags))] uint16 TargetInfoLen;
                 [value(TargetInfoLen)] uint16 TargetNameInfoMaxLen;
                 [relative] [subcontext(0),subcontext_size(TargetInfoLen)] AV_PAIR_LIST *TargetInfo;
@@ -314 +314 @@
                 );
 
+        void decode_NTLMv2_RESPONSE(
+                [in] NTLMv2_RESPONSE response
+                );
+
 }

trunk/server/librpc/idl/samr.idl

@@ -24 +24 @@
                 SAM_DATABASE_PRIVS   = 2 /* Privileges */
         } netr_SamDatabaseID;
-
-        typedef [public,v1_enum] enum {
-                SAMR_REJECT_OTHER      = 0,
-                SAMR_REJECT_TOO_SHORT  = 1,
-                SAMR_REJECT_IN_HISTORY = 2,
-                SAMR_REJECT_COMPLEXITY = 5
-        } samr_RejectReason;
-
-
 
         /* account control (acct_flags) bits */
@@ -54 +45 @@
                 ACB_DONT_REQUIRE_PREAUTH        = 0x00010000,  /* 1 = Preauth not required */
                 ACB_PW_EXPIRED                  = 0x00020000,  /* 1 = Password Expired */
-                ACB_NO_AUTH_DATA_REQD           = 0x00080000   /* 1 = No authorization data required */
+                ACB_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION = 0x00040000,
+                ACB_NO_AUTH_DATA_REQD           = 0x00080000,  /* 1 = No authorization data required */
+                ACB_PARTIAL_SECRETS_ACCOUNT     = 0x00100000,
+                ACB_USE_AES_KEYS                = 0x00200000
         } samr_AcctFlags;
 
@@ -665 +659 @@
                 uint32 count;
                 [size_is(count)] uint32 *rids;
-                [size_is(count)] uint32 *types;
-        } samr_RidTypeArray;
+                [size_is(count)] samr_GroupAttrs *attributes;
+        } samr_RidAttrArray;
 
         NTSTATUS samr_QueryGroupMember(
                 [in,ref]  policy_handle *group_handle,
-                [out,ref] samr_RidTypeArray **rids
+                [out,ref] samr_RidAttrArray **rids
                 );
 
@@ -816 +810 @@
         typedef struct {
                 lsa_String comment;
-                lsa_String unknown; /* settable, but doesn't stick. probably obsolete */
+                lsa_String reserved; /* settable, but doesn't stick. probably obsolete */
                 uint16 country_code;
                 uint16 code_page;
@@ -992 +986 @@
                 lsa_BinaryString lm_owf_password;
                 lsa_BinaryString nt_owf_password;
-                lsa_String unknown3;
+                lsa_String private_data;
                 uint32 buf_count;
                 [size_is(buf_count)] uint8 *buffer;
@@ -1007 +1001 @@
                 uint8  nt_password_set;
                 uint8  password_expired;
-                uint8  unknown4;
+                uint8  private_data_sensitive;
         } samr_UserInfo21;
 
@@ -1448 +1442 @@
         /* Function    0x3f     */
 
-        typedef enum samr_RejectReason samr_RejectReason;
-
-        typedef struct {
-                samr_RejectReason reason;
-                uint32 unknown1;
-                uint32 unknown2;
-        } samr_ChangeReject;
-
-        NTSTATUS samr_ChangePasswordUser3(
+        typedef [public,v1_enum] enum {
+                SAM_PWD_CHANGE_NO_ERROR             = 0,
+                SAM_PWD_CHANGE_PASSWORD_TOO_SHORT   = 1,
+                SAM_PWD_CHANGE_PWD_IN_HISTORY       = 2,
+                SAM_PWD_CHANGE_USERNAME_IN_PASSWORD = 3,
+                SAM_PWD_CHANGE_FULLNAME_IN_PASSWORD = 4,
+                SAM_PWD_CHANGE_NOT_COMPLEX          = 5,
+                SAM_PWD_CHANGE_MACHINE_NOT_DEFAULT  = 6,
+                SAM_PWD_CHANGE_FAILED_BY_FILTER     = 7,
+                SAM_PWD_CHANGE_PASSWORD_TOO_LONG    = 8
+        } samPwdChangeReason;
+
+        typedef struct {
+                samPwdChangeReason extendedFailureReason;
+                [string,charset(UTF16)] uint16 *filterModuleName;
+        } userPwdChangeFailureInformation;
+
+        [public] NTSTATUS samr_ChangePasswordUser3(
                 [in,unique]       lsa_String *server,
                 [in,ref]          lsa_String *account,
@@ -1466 +1469 @@
                 [in,unique]       samr_CryptPassword *password3,
                 [out,ref]         samr_DomInfo1 **dominfo,
-                [out,ref]         samr_ChangeReject **reject
+                [out,ref]         userPwdChangeFailureInformation **reject
                 );
 

trunk/server/librpc/idl/schannel.idl

@@ -91 +91 @@
         } NL_AUTH_SIGNATURE;
 
+        const int NL_AUTH_SIGNATURE_SIZE = 0x20;
+
         /* MS-NRPC 2.2.1.3.3 NL_AUTH_SHA2_SIGNATURE */
 

trunk/server/librpc/idl/security.idl

@@ -32 +32 @@
 interface security
 {
+
+        typedef bitmap lsa_SystemAccessModeFlags lsa_SystemAccessModeFlags;
 
         typedef [public,gensize,noprint,nosize,nopull,nopush] struct {
@@ -263 +265 @@
         const string SID_BUILTIN_REMOTE_DESKTOP_USERS   = "S-1-5-32-555";
         const string SID_BUILTIN_NETWORK_CONF_OPERATORS = "S-1-5-32-556";
+        const string SID_BUILTIN_INCOMING_FOREST_TRUST  = "S-1-5-32-557";
+        const string SID_BUILTIN_PERFMON_USERS          = "S-1-5-32-558";
+        const string SID_BUILTIN_PERFLOG_USERS          = "S-1-5-32-559";
+        const string SID_BUILTIN_AUTH_ACCESS            = "S-1-5-32-560";
+        const string SID_BUILTIN_TS_LICENSE_SERVERS     = "S-1-5-32-561";
+
+        /* SECURITY_NT_SERVICE */
+        const string NAME_NT_SERVICE            = "NT SERVICE";
+
+        const string SID_NT_NT_SERVICE          = "S-1-5-80";
+        const string SID_NT_TRUSTED_INSTALLER =
+                "S-1-5-80-956008885-3418522649-1831038044-1853292631-2271478464";
 
         /* well-known domain RIDs */
-        const int DOMAIN_RID_LOGON                 = 9;
-        const int DOMAIN_RID_ADMINISTRATOR         = 500;
-        const int DOMAIN_RID_GUEST                 = 501;
-        const int DOMAIN_RID_KRBTGT                = 502;
-        const int DOMAIN_RID_ADMINS                = 512;
-        const int DOMAIN_RID_USERS                 = 513;
-        const int DOMAIN_RID_GUESTS                = 514;
-        const int DOMAIN_RID_DOMAIN_MEMBERS        = 515;
-        const int DOMAIN_RID_DCS                   = 516;
-        const int DOMAIN_RID_CERT_ADMINS           = 517;
-        const int DOMAIN_RID_SCHEMA_ADMINS         = 518;
-        const int DOMAIN_RID_ENTERPRISE_ADMINS     = 519;
-        const int DOMAIN_RID_POLICY_ADMINS         = 520;
-
-
-        /*
-          privilege IDs. Please keep the IDs below 64. If we get more
-          than 64 then we need to change security_token
-        */
+        const int DOMAIN_RID_LOGON                   = 9;
+        const int DOMAIN_RID_ENTERPRISE_READONLY_DCS = 498;
+        const int DOMAIN_RID_ADMINISTRATOR           = 500;
+        const int DOMAIN_RID_GUEST                   = 501;
+        const int DOMAIN_RID_KRBTGT                  = 502;
+        const int DOMAIN_RID_ADMINS                  = 512;
+        const int DOMAIN_RID_USERS                   = 513;
+        const int DOMAIN_RID_GUESTS                  = 514;
+        const int DOMAIN_RID_DOMAIN_MEMBERS          = 515;
+        const int DOMAIN_RID_DCS                     = 516;
+        const int DOMAIN_RID_CERT_ADMINS             = 517;
+        const int DOMAIN_RID_SCHEMA_ADMINS           = 518;
+        const int DOMAIN_RID_ENTERPRISE_ADMINS       = 519;
+        const int DOMAIN_RID_POLICY_ADMINS           = 520;
+        const int DOMAIN_RID_READONLY_DCS            = 521;
+        const int DOMAIN_RID_RAS_SERVERS             = 553;
+        const int DOMAIN_RID_RODC_ALLOW              = 571;
+        const int DOMAIN_RID_RODC_DENY               = 572;
+
+        /* well-known builtin RIDs */
+        const int BUILTIN_RID_ADMINISTRATORS            = 544;
+        const int BUILTIN_RID_USERS                     = 545;
+        const int BUILTIN_RID_GUESTS                    = 546;
+        const int BUILTIN_RID_POWER_USERS               = 547;
+        const int BUILTIN_RID_ACCOUNT_OPERATORS         = 548;
+        const int BUILTIN_RID_SERVER_OPERATORS          = 549;
+        const int BUILTIN_RID_PRINT_OPERATORS           = 550;
+        const int BUILTIN_RID_BACKUP_OPERATORS          = 551;
+        const int BUILTIN_RID_REPLICATOR                = 552;
+        const int BUILTIN_RID_RAS_SERVERS               = 553;
+        const int BUILTIN_RID_PRE_2K_ACCESS             = 554;
+        const int BUILTIN_RID_REMOTE_DESKTOP_USERS      = 555;
+        const int BUILTIN_RID_NETWORK_CONF_OPERATORS    = 556;
+        const int BUILTIN_RID_INCOMING_FOREST_TRUST     = 557;
+        const int BUILTIN_RID_PERFMON_USERS             = 558;
+        const int BUILTIN_RID_PERFLOG_USERS             = 559;
+        const int BUILTIN_RID_AUTH_ACCESS               = 560;
+        const int BUILTIN_RID_TS_LICENSE_SERVERS        = 561;
+
+/********************************************************************
+ This is a list of privileges reported by a WIndows 2008 R2 DC
+ just for reference purposes (and I know the LUID is not guaranteed
+ across reboots):
+
+0x00000002          SeCreateTokenPrivilege "Create a token object"
+0x00000003   SeAssignPrimaryTokenPrivilege "Replace a process level token"
+0x00000004           SeLockMemoryPrivilege "Lock pages in memory"
+0x00000005        SeIncreaseQuotaPrivilege "Adjust memory quotas for a process"
+0x00000006       SeMachineAccountPrivilege "Add workstations to domain"
+0x00000007                  SeTcbPrivilege "Act as part of the operating system"
+0x00000008             SeSecurityPrivilege "Manage auditing and security log"
+0x00000009        SeTakeOwnershipPrivilege "Take ownership of files or other objects"
+0x0000000a           SeLoadDriverPrivilege "Load and unload device drivers"
+0x0000000b        SeSystemProfilePrivilege "Profile system performance"
+0x0000000c           SeSystemtimePrivilege "Change the system time"
+0x0000000d SeProfileSingleProcessPrivilege "Profile single process"
+0x0000000e SeIncreaseBasePriorityPrivilege "Increase scheduling priority"
+0x0000000f       SeCreatePagefilePrivilege "Create a pagefile"
+0x00000010      SeCreatePermanentPrivilege "Create permanent shared objects"
+0x00000011               SeBackupPrivilege "Back up files and directories"
+0x00000012              SeRestorePrivilege "Restore files and directories"
+0x00000013             SeShutdownPrivilege "Shut down the system"
+0x00000014                SeDebugPrivilege "Debug programs"
+0x00000015                SeAuditPrivilege "Generate security audits"
+0x00000016    SeSystemEnvironmentPrivilege "Modify firmware environment values"
+0x00000017         SeChangeNotifyPrivilege "Bypass traverse checking"
+0x00000018       SeRemoteShutdownPrivilege "Force shutdown from a remote system"
+0x00000019               SeUndockPrivilege "Remove computer from docking station"
+0x0000001a            SeSyncAgentPrivilege "Synchronize directory service data"
+0x0000001b     SeEnableDelegationPrivilege "Enable computer and user accounts to be trusted for delegation"
+0x0000001c         SeManageVolumePrivilege "Perform volume maintenance tasks"
+0x0000001d          SeImpersonatePrivilege "Impersonate a client after authentication"
+0x0000001e         SeCreateGlobalPrivilege "Create global objects"
+0x0000001f SeTrustedCredManAccessPrivilege "Access Credential Manager as a trusted caller"
+0x00000020              SeRelabelPrivilege "Modify an object label"
+0x00000021   SeIncreaseWorkingSetPrivilege "Increase a process working set"
+0x00000022             SeTimeZonePrivilege "Change the time zone"
+0x00000023   SeCreateSymbolicLinkPrivilege "Create symbolic links"
+
+ ********************************************************************/
+
+        /* LUID values for privileges known about by Samba (bottom 32 bits of enum, top bits are 0) */
+
+        /* we have to define the LUID here due to a horrible check by printmig.exe
+           that requires the SeBackupPrivilege match what is in Windows.  So match
+           those that we implement and start Samba privileges at 0x1001 */
+
         typedef enum {
-                SEC_PRIV_SECURITY                  = 1,
-                SEC_PRIV_BACKUP                    = 2,
-                SEC_PRIV_RESTORE                   = 3,
-                SEC_PRIV_SYSTEMTIME                = 4,
-                SEC_PRIV_SHUTDOWN                  = 5,
-                SEC_PRIV_REMOTE_SHUTDOWN           = 6,
-                SEC_PRIV_TAKE_OWNERSHIP            = 7,
-                SEC_PRIV_DEBUG                     = 8,
-                SEC_PRIV_SYSTEM_ENVIRONMENT        = 9,
-                SEC_PRIV_SYSTEM_PROFILE            = 10,
-                SEC_PRIV_PROFILE_SINGLE_PROCESS    = 11,
-                SEC_PRIV_INCREASE_BASE_PRIORITY    = 12,
-                SEC_PRIV_LOAD_DRIVER               = 13,
-                SEC_PRIV_CREATE_PAGEFILE           = 14,
-                SEC_PRIV_INCREASE_QUOTA            = 15,
-                SEC_PRIV_CHANGE_NOTIFY             = 16,
-                SEC_PRIV_UNDOCK                    = 17,
-                SEC_PRIV_MANAGE_VOLUME             = 18,
-                SEC_PRIV_IMPERSONATE               = 19,
-                SEC_PRIV_CREATE_GLOBAL             = 20,
-                SEC_PRIV_ENABLE_DELEGATION         = 21,
-                SEC_PRIV_INTERACTIVE_LOGON         = 22,
-                SEC_PRIV_NETWORK_LOGON             = 23,
-                SEC_PRIV_REMOTE_INTERACTIVE_LOGON  = 24,
-                SEC_PRIV_MACHINE_ACCOUNT           = 25
+                SEC_PRIV_INVALID                   = 0x0,
+                SEC_PRIV_INCREASE_QUOTA            = 0x5,
+                SEC_PRIV_MACHINE_ACCOUNT           = 0x6,
+                SEC_PRIV_SECURITY                  = 0x8,
+                SEC_PRIV_TAKE_OWNERSHIP            = 0x09,
+                SEC_PRIV_LOAD_DRIVER               = 0x0a,
+                SEC_PRIV_SYSTEM_PROFILE            = 0x0b,
+                SEC_PRIV_SYSTEMTIME                = 0x0c,
+                SEC_PRIV_PROFILE_SINGLE_PROCESS    = 0x0d,
+                SEC_PRIV_INCREASE_BASE_PRIORITY    = 0x0e,
+                SEC_PRIV_CREATE_PAGEFILE           = 0x0f,
+                SEC_PRIV_BACKUP                    = 0x11,
+                SEC_PRIV_RESTORE                   = 0x12,
+                SEC_PRIV_SHUTDOWN                  = 0x13,
+                SEC_PRIV_DEBUG                     = 0x14,
+                SEC_PRIV_SYSTEM_ENVIRONMENT        = 0x16,
+                SEC_PRIV_CHANGE_NOTIFY             = 0x17,
+                SEC_PRIV_REMOTE_SHUTDOWN           = 0x18,
+                SEC_PRIV_UNDOCK                    = 0x19,
+                SEC_PRIV_ENABLE_DELEGATION         = 0x1b,
+                SEC_PRIV_MANAGE_VOLUME             = 0x1c,
+                SEC_PRIV_IMPERSONATE               = 0x1d,
+                SEC_PRIV_CREATE_GLOBAL             = 0x1e,
+                /* Samba-specific privs */
+                SEC_PRIV_PRINT_OPERATOR            = 0x1001,
+                SEC_PRIV_ADD_USERS                 = 0x1002,
+                SEC_PRIV_DISK_OPERATOR             = 0x1003
         } sec_privilege;
 
+
+        /* Bitmap of privilege values for internal use only.  We need
+         * our own bitmap here as privilages.tdb records these values
+         * as a bitmap (privilages.ldb uses the string forms).
+         */
+        typedef [bitmap64bit] bitmap {
+                SEC_PRIV_MACHINE_ACCOUNT_BIT            = 0x00000010,
+
+                /* Samba-specific privs */
+                SEC_PRIV_PRINT_OPERATOR_BIT             = 0x00000020,
+                SEC_PRIV_ADD_USERS_BIT                  = 0x00000040,
+                SEC_PRIV_DISK_OPERATOR_BIT              = 0x00000080,
+
+                SEC_PRIV_REMOTE_SHUTDOWN_BIT            = 0x00000100,
+                SEC_PRIV_BACKUP_BIT                     = 0x00000200,
+                SEC_PRIV_RESTORE_BIT                    = 0x00000400,
+                SEC_PRIV_TAKE_OWNERSHIP_BIT             = 0x00000800,
+                /* End of privilages implemented before merge to common code */
+
+                SEC_PRIV_INCREASE_QUOTA_BIT               = 0x00001000,
+                SEC_PRIV_SECURITY_BIT                     = 0x00002000,
+                SEC_PRIV_LOAD_DRIVER_BIT                  = 0x00004000,
+                SEC_PRIV_SYSTEM_PROFILE_BIT               = 0x00008000,
+                SEC_PRIV_SYSTEMTIME_BIT                   = 0x00010000,
+                SEC_PRIV_PROFILE_SINGLE_PROCESS_BIT       = 0x00020000,
+                SEC_PRIV_INCREASE_BASE_PRIORITY_BIT       = 0x00040000,
+                SEC_PRIV_CREATE_PAGEFILE_BIT              = 0x00080000,
+                SEC_PRIV_SHUTDOWN_BIT                     = 0x00100000,
+                SEC_PRIV_DEBUG_BIT                        = 0x00200000,
+                SEC_PRIV_SYSTEM_ENVIRONMENT_BIT           = 0x00400000,
+                SEC_PRIV_CHANGE_NOTIFY_BIT                = 0x00800000,
+                SEC_PRIV_UNDOCK_BIT                       = 0x01000000,
+                SEC_PRIV_ENABLE_DELEGATION_BIT            = 0x02000000,
+                SEC_PRIV_MANAGE_VOLUME_BIT                = 0x04000000,
+                SEC_PRIV_IMPERSONATE_BIT                  = 0x08000000,
+                SEC_PRIV_CREATE_GLOBAL_BIT                = 0x10000000
+        } se_privilege;
+
+        typedef [bitmap32bit] bitmap {
+                LSA_POLICY_MODE_INTERACTIVE             = 0x00000001,
+                LSA_POLICY_MODE_NETWORK                 = 0x00000002,
+                LSA_POLICY_MODE_BATCH                   = 0x00000004,
+                LSA_POLICY_MODE_SERVICE                 = 0x00000010,
+                LSA_POLICY_MODE_PROXY                   = 0x00000020,
+                LSA_POLICY_MODE_DENY_INTERACTIVE        = 0x00000040,
+                LSA_POLICY_MODE_DENY_NETWORK            = 0x00000080,
+                LSA_POLICY_MODE_DENY_BATCH              = 0x00000100,
+                LSA_POLICY_MODE_DENY_SERVICE            = 0x00000200,
+                LSA_POLICY_MODE_REMOTE_INTERACTIVE      = 0x00000400,
+                LSA_POLICY_MODE_DENY_REMOTE_INTERACTIVE = 0x00000800,
+                LSA_POLICY_MODE_ALL                     = 0x00000FF7,
+                LSA_POLICY_MODE_ALL_NT4                 = 0x00000037
+        } lsa_SystemAccessModeFlags;
 
         typedef [public,bitmap8bit] bitmap {
@@ -372 +509 @@
                 security_ace_type type;  /* SEC_ACE_TYPE_* */
                 security_ace_flags flags; /* SEC_ACE_FLAG_* */
-                [value(ndr_size_security_ace(r,ndr->iconv_convenience,ndr->flags))] uint16 size;
+                [value(ndr_size_security_ace(r,ndr->flags))] uint16 size;
                 uint32 access_mask;
                 [switch_is(type)] security_ace_object_ctr object;
@@ -387 +524 @@
         typedef [public,gensize,nosize] struct {
                 security_acl_revision revision;
-                [value(ndr_size_security_acl(r,ndr->iconv_convenience,ndr->flags))] uint16 size;
+                [value(ndr_size_security_acl(r,ndr->flags))] uint16 size;
                 [range(0,1000)] uint32 num_aces;
                 security_ace aces[num_aces];
@@ -429 +566 @@
 
         typedef [public] struct {
-                [range(0,0x40000),value(ndr_size_security_descriptor(sd,ndr->iconv_convenience,ndr->flags))] uint32 sd_size;
+                [range(0,0x40000),value(ndr_size_security_descriptor(sd,ndr->flags))] uint32 sd_size;
                 [subcontext(4)] security_descriptor *sd;
         } sec_desc_buf;
 
+        /* This is not yet sent over the network, but is simply defined in IDL */
         typedef [public] struct {
-                dom_sid *user_sid;
-                dom_sid *group_sid;
                 uint32 num_sids;
-                [size_is(num_sids)] dom_sid *sids[*];
-                udlong privilege_mask;
-                security_acl *default_dacl;
+                [size_is(num_sids)] dom_sid sids[*];
+                se_privilege privilege_mask;
+                lsa_SystemAccessModeFlags rights_mask;
         } security_token;
+
+        /* This is not yet sent over the network, but is simply defined in IDL */
+        typedef [public] struct {
+                uid_t uid;
+                uid_t gid;
+                uint32 ngroups;
+                [size_is(ngroups)] gid_t groups[*];
+        } security_unix_token;
 
         /* bits that determine which parts of a security descriptor
@@ -470 +614 @@
                 SEC_GROUP_FROM_PARENT                = 0x00000010
         } security_autoinherit;
+
+        /***************************************************************/
+        /* Extended right guids */
+
+        const string GUID_DRS_ALLOCATE_RIDS           = "1abd7cf8-0a99-11d1-adbb-00c04fd8d5cd";
+        const string GUID_DRS_CHANGE_DOMAIN_MASTER    = "014bf69c-7b3b-11d1-85f6-08002be74fab";
+        const string GUID_DRS_CHANGE_INFR_MASTER      = "cc17b1fb-33d9-11d2-97d4-00c04fd8d5cd";
+        const string GUID_DRS_CHANGE_PDC              = "bae50096-4752-11d1-9052-00c04fc2d4cf";
+        const string GUID_DRS_CHANGE_RID_MASTER       = "d58d5f36-0a98-11d1-adbb-00c04fd8d5cd";
+        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_GET_ALL_CHANGES         = "1131f6ad-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";
+
+        /***************************************************************/
+        /* validated writes guids */
+        const string GUID_DRS_VALIDATE_SPN            = "f3a64788-5306-11d1-a9c5-0000f80367c1";
+        const string GUID_DRS_SELF_MEMBERSHIP         = "bf9679c0-0de6-11d0-a285-00aa003049e2";
+        const string GUID_DRS_DNS_HOST_NAME           = "72e39547-7b18-11d1-adef-00c04fd8d5cd";
+        const string GUID_DRS_ADD_DNS_HOST_NAME       = "80863791-dbe9-4eb8-837e-7f0ab55d9ac7";
+        const string GUID_DRS_BEHAVIOR_VERSION        = "d31a8757-2447-4545-8081-3bb610cacbf2";
+
+        /* A type to describe the mapping of generic access rights to object
+           specific access rights. */
+
+        typedef struct {
+                uint32 generic_read;
+                uint32 generic_write;
+                uint32 generic_execute;
+                uint32 generic_all;
+        } generic_mapping;
+
+        typedef struct {
+                uint32 std_read;
+                uint32 std_write;
+                uint32 std_execute;
+                uint32 std_all;
+        } standard_mapping;
 }

trunk/server/librpc/idl/spoolss.idl

@@ -30 +30 @@
 
         typedef struct {
-                [value(ndr_size_spoolss_Time(time, ndr->iconv_convenience, ndr->flags))] uint32 size;
+                [value(ndr_size_spoolss_Time(time, ndr->flags))] uint32 size;
                 [unique] spoolss_Time *time;
         } spoolss_TimeCtr;
@@ -120 +120 @@
         } spoolss_JobStatus;
 
+        typedef [v1_enum] enum {
+                SPOOLSS_DEBUGGING_BUILD         = 0x00000000,
+                SPOOLSS_RELEASE_BUILD           = 0x00000001
+        } spoolss_Build;
+
         typedef [public,gensize] struct {
                 [relative] nstring *printername;
@@ -130 +135 @@
                 uint32 total_pages;
                 uint32 version;
-                uint32 free_build;
+                spoolss_Build free_build;
                 uint32 spooling;
                 uint32 max_spooling;
@@ -151 +156 @@
                 uint32 reserved3;
         } spoolss_PrinterInfo0;
+
+        /* Device Mode Extra Data */
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA        = 0x554e4944, /* 0x44494e55 */
+                SPOOLSS_DM_SIGNATURE_JTEXP              = 0x4a544d53, /* 0x534d544a */
+                SPOOLSS_DM_SIGNATURE_PSEXTRA            = 0x50524956 /* 0x56495250 */
+        } spoolss_DM_Signature;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_LAYOUT_NUP_DISABLED          = 0x00000000,
+                SPOOLSS_DM_LAYOUT_NUP_2                 = 0x00000001,
+                SPOOLSS_DM_LAYOUT_NUP_4                 = 0x00000002,
+                SPOOLSS_DM_LAYOUT_NUP_6                 = 0x00000003,
+                SPOOLSS_DM_LAYOUT_NUP_9                 = 0x00000004,
+                SPOOLSS_DM_LAYOUT_NUP_16                = 0x00000005,
+                SPOOLSS_DM_LAYOUT_BOOKLET               = 0x00000006
+        } spoolss_DM_Layout;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_NUP_DIRECTION_L2R_T2B        = 0x00000001,
+                SPOOLSS_DM_NUP_DIRECTION_T2B_L2R        = 0x00000002,
+                SPOOLSS_DM_NUP_DIRECTION_R2L_T2B        = 0x00000004,
+                SPOOLSS_DM_NUP_DIRECTION_T2B_R2L        = 0x00000008
+        } spoolss_DM_NupDirection;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_NUP_BORDER_PRINT             = 0x00000000,
+                SPOOLSS_DM_NUP_BORDER_NONE              = 0x00000001
+        } spoolss_DM_NupBorderFlags;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_BOOKLET_LEFT_FLIP            = 0x00000000,
+                SPOOLSS_DM_BOOKLET_RIGHT_FLIP           = 0x00000001
+        } spoolss_DM_BookletFlags;
+
+        /* Device Mode Extra Data: PostScript */
+
+        /* NT 3.51 */
+
+        typedef [bitmap32bit] bitmap {
+                SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER   = 0x00000002,
+                SPOOLSS_DM_PS_FLAGS_PRINT_MIRROR        = 0x00000004,
+                SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE      = 0x00000010,
+                SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP     = 0x00000040,
+                SPOOLSS_DM_PS_FLAGS_ROTATE_180          = 0x00000200,
+                SPOOLSS_DM_PS_FLAGS_GDI_METAFILE_SPOOL  = 0x00002000
+        } spoolss_DMPS_Flags;
+
+        typedef struct {
+                [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] spoolss_DM_Signature dwSignature;
+                spoolss_DMPS_Flags dwFlags;
+                uint32 wchEPSFile[12];
+                [value(24)] uint16 caSize;
+                uint16 caFlags;
+                uint16 caIlluminantIndex;
+                uint16 caRedGamma;
+                uint16 caGreenGamma;
+                uint16 caBlueGamma;
+                uint16 caReferenceBlack;
+                uint16 caReferenceWhite;
+                uint16 caContrast;
+                uint16 caBrightness;
+                uint16 caColorfulness;
+                uint16 caRedGreenTint;
+        } spoolss_PSDRVEXTRA351;
+
+        /* NT 4.0 */
+
+        typedef struct {
+                [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] spoolss_DM_Signature dwSignature;
+                spoolss_DMPS_Flags dwFlags;
+                uint32 wchEPSFile[12];
+                [value(24)] uint16 caSize;
+                uint16 caFlags;
+                uint16 caIlluminantIndex;
+                uint16 caRedGamma;
+                uint16 caGreenGamma;
+                uint16 caBlueGamma;
+                uint16 caReferenceBlack;
+                uint16 caReferenceWhite;
+                uint16 caContrast;
+                uint16 caBrightness;
+                uint16 caColorfulness;
+                uint16 caRedGreenTint;
+                uint16 wChecksum;
+                uint16 wOptions;
+                uint32 aubOptions[8];
+        } spoolss_PSDRVEXTRA400;
+
+        /* 2000 & XP */
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_PS_OPTIMIZE_SPEED            = 0x00000000,
+                SPOOLSS_DM_PS_OPTIMIZE_PORTABILITY      = 0x00000001,
+                SPOOLSS_DM_PS_OPTIMIZE_EPS              = 0x00000002,
+                SPOOLSS_DM_PS_OPTIMIZE_ARCHIVAL         = 0x00000003
+        } spoolss_DMPS_Dialect;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_PS_TTDLFMT_DEFAULT           = 0x00000000,
+                SPOOLSS_DM_PS_TTDLFMT_TYPE_1            = 0x00000001,
+                SPOOLSS_DM_PS_TTDLFMT_TYPE_3            = 0x00000002,
+                SPOOLSS_DM_PS_TTDLFMT_TYPE_42           = 0x00000003
+        } spoolss_DMPS_TTDLFmt;
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_PS_PSLEVEL_1 = 0x00000001,
+                SPOOLSS_DM_PS_PSLEVEL_2 = 0x00000002,
+                SPOOLSS_DM_PS_PSLEVEL_3 = 0x00000003
+        } spoolss_DMPS_PSLevel;
+
+        typedef enum {
+                SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST            = 0x0000,
+                SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST           = 0x0001,
+                SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST_UPSIDEDOWN = 0x0002,
+                SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST_UPSIDEDOWN= 0x0003
+        } spoolss_DMPS_FeedDirection;
+
+        typedef struct {
+                [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] spoolss_DM_Signature dwSignature;
+                spoolss_DMPS_Flags dwFlags;
+                uint32 wchEPSFile[12];
+                [value(24)] uint16 caSize;
+                uint16 caFlags;
+                uint16 caIlluminantIndex;
+                uint16 caRedGamma;
+                uint16 caGreenGamma;
+                uint16 caBlueGamma;
+                uint16 caReferenceBlack;
+                uint16 caReferenceWhite;
+                uint16 caContrast;
+                uint16 caBrightness;
+                uint16 caColorfulness;
+                uint16 caRedGreenTint;
+                uint16 wReserved1;
+                uint16 wSize;
+                uint32 fxScrFreq;
+                uint32 fxScrAngle;
+                spoolss_DMPS_Dialect iDialect;
+                spoolss_DMPS_TTDLFmt iTTDLFmt;
+                boolean32 bReversePrint;
+                spoolss_DM_Layout iLayout;
+                spoolss_DMPS_PSLevel iPSLevel;
+                uint32 dwReserved2;
+                uint16 wOEMExtra;
+                [value(0x0010)] uint16 wVer;
+                uint32 dwX;
+                uint32 dwY;
+                uint32 dwWidthOffset;
+                uint32 dwHeightOffset;
+                spoolss_DMPS_FeedDirection wFeedDirection;
+                uint16 wCutSheet;
+                uint32 dwReserved3[4];
+                uint32 dwChecksum32;
+                uint32 dwOptions;
+                uint32 aOptions[128];
+        } spoolss_PSDRVEXTRA500;
+
+        /* Vista, 2008, 7 */
+
+        typedef struct {
+                [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] spoolss_DM_Signature dwSignature;
+                spoolss_DMPS_Flags dwFlags;
+                uint32 wchEPSFile[12];
+                [value(24)] uint16 caSize;
+                uint16 caFlags;
+                uint16 caIlluminantIndex;
+                uint16 caRedGamma;
+                uint16 caGreenGamma;
+                uint16 caBlueGamma;
+                uint16 caReferenceBlack;
+                uint16 caReferenceWhite;
+                uint16 caContrast;
+                uint16 caBrightness;
+                uint16 caColorfulness;
+                uint16 caRedGreenTint;
+                uint16 wCoreJTExpSize;
+                [value(ndr_size_spoolss_PSDRVEXTRA(r, ndr->flags) + wCoreJTExpSize)] uint16 wCoreFullSize;
+                uint32 fxScrFreq;
+                uint32 fxScrAngle;
+                spoolss_DMPS_Dialect iDialect;
+                spoolss_DMPS_TTDLFmt iTTDLFmt;
+                boolean32 bReversePrint;
+                spoolss_DM_Layout iLayout;
+                spoolss_DMPS_PSLevel iPSLevel;
+                uint32 dwReserved2;
+                uint16 wOEMExtra;
+                [value(0x0010)] uint16 wVer;
+                uint32 dwX;
+                uint32 dwY;
+                uint32 dwWidthOffset;
+                uint32 dwHeightOffset;
+                spoolss_DMPS_FeedDirection wFeedDirection;
+                uint16 wCutSheet;
+                uint32 dwReserved3[4];
+                uint32 dwChecksum32;
+                uint32 dwOptions;
+                uint32 aOptions[128];
+                spoolss_DM_NupDirection dwNupDirection;
+                spoolss_DM_NupBorderFlags dwNupBorderFlags;
+                spoolss_DM_BookletFlags dwBookletFlags;
+                uint32 dwPadding;
+        } spoolss_PSDRVEXTRA;
+
+        /* Device Mode Extra Data: UniDriver */
+
+        /* NT 3.5, NT 4.0 */
+
+        typedef struct {
+                uint16 wReserved[56];
+        } spoolss_UNIDRVEXTRA3_4;
+
+        /* 2000, XP */
+
+        typedef [v1_enum] enum {
+                SPOOLSS_DM_UNI_QUALITY_BEST             = 0x00000000,
+                SPOOLSS_DM_UNI_QUALITY_MEDIUM           = 0x00000001,
+                SPOOLSS_DM_UNI_QUALITY_DRAFT            = 0x00000002
+        } spoolss_DMUNI_Quality;
+
+        typedef [bitmap32bit] bitmap {
+                SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS     = 0x00000002,
+                SPOOLSS_DM_UNI_FLAGS_AVOID_EMFSPOOL             = 0x00000010,
+                SPOOLSS_DM_UNI_FLAGS_CUSTOM_HALFTONING          = 0x00000080
+        } spoolss_DMUNI_Flags;
+
+        typedef struct {
+                [value(SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA)] spoolss_DM_Signature dwSignature;
+                [value(0x0022)] uint16 wVer;
+                uint16 sPadding;
+                uint16 wSize;
+                uint16 wOEMExtra;
+                uint32 dwChecksum32;
+                spoolss_DMUNI_Flags dwFlags;
+                boolean32 bReversePrint;
+                spoolss_DM_Layout iLayout;
+                spoolss_DMUNI_Quality iQuality;
+                uint16 wReserved[6];
+                uint32 dwOptions;
+                uint32 aOptions[128];
+        } spoolss_UNIDRVEXTRA500;
+
+        /* Vista, 2008, 7 */
+
+        typedef [public,gensize] struct {
+                [value(SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA)] spoolss_DM_Signature dwSignature;
+                [value(0x0022)] uint16 wVer;
+                uint16 wCoreJTExpSize;
+                [value(ndr_size_spoolss_UNIDRVEXTRA(r, ndr->flags) + wCoreJTExpSize)] uint16 wCoreFullSize;
+                uint16 wOEMExtra;
+                uint32 dwChecksum32;
+                spoolss_DMUNI_Flags dwFlags;
+                boolean32 bReversePrint;
+                spoolss_DM_Layout iLayout;
+                spoolss_DMUNI_Quality iQuality;
+                uint16 wReserved[6];
+                uint32 dwOptions;
+                uint32 aOptions[128];
+                spoolss_DM_NupDirection dwNupDirection;
+                spoolss_DM_NupBorderFlags dwNupBorderFlags;
+                spoolss_DM_BookletFlags dwBookletFlags;
+        } spoolss_UNIDRVEXTRA;
+
+        /* Device Mode Extra Data: JTEXP */
+
+        typedef struct {
+                uint32 dwSize;
+                [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;
+        } spoolss_JTEXP;
+
+        /* Device Mode Extra Data: OEM_DMEXTRA */
+
+        typedef struct {
+                uint32 dwSize;
+                spoolss_DM_Signature dwSignature;
+                uint32 dwVersion;
+                [flag(NDR_REMAINING)] DATA_BLOB Data;
+        } spoolss_OEM_DMEXTRA;
+
+        typedef [nodiscriminant] union {
+                [case(0x0350)] spoolss_PSDRVEXTRA351    psdrvextra351;
+                [case(0x0400)] spoolss_PSDRVEXTRA400    psdrvextra400;
+                [case(0x0501)] spoolss_PSDRVEXTRA500    psdrvextra500;
+                [case(0x0600)] spoolss_PSDRVEXTRA       psdrvextra;
+                [default] [flag(NDR_REMAINING)] DATA_BLOB psblob;
+        } spoolss_DeviceModeExtraDataPostScript;
+
+        typedef [nodiscriminant] union {
+                [case(0x0301)] spoolss_UNIDRVEXTRA3_4   unidrvextra3_4;
+                [case(0x0500)] spoolss_UNIDRVEXTRA500   unidrvextra500;
+                [case(0x0600)] spoolss_UNIDRVEXTRA      unidrvextra;
+                [default] [flag(NDR_REMAINING)] DATA_BLOB uniblob;
+        } spoolss_DeviceModeExtraDataUniDriver;
 
         typedef [bitmap32bit] bitmap {
@@ -463 +767 @@
 
         typedef [public,gensize] struct {
-                spoolss_PrinterAttributes flags;
+                spoolss_EnumPrinterFlags flags;
                 [relative] nstring *description;
                 [relative] nstring *name;
@@ -581 +885 @@
         /* Function: 0x01 */
         typedef struct {
-                [value(_ndr_size_spoolss_DeviceMode(devmode, ndr->iconv_convenience, ndr->flags))] uint32 _ndr_size;
+                [value(_ndr_size_spoolss_DeviceMode(devmode, ndr->flags))] uint32 _ndr_size;
                 [subcontext(4),subcontext_size(_ndr_size)] spoolss_DeviceMode *devmode;
         } spoolss_DevmodeContainer;
@@ -858 +1162 @@
                 uint32 total_pages;
                 uint32 version;
-                uint32 free_build;
+                spoolss_Build free_build;
                 uint32 spooling;
                 uint32 max_spooling;
@@ -864 +1168 @@
                 uint32 num_error_out_of_paper;
                 uint32 num_error_not_ready;
-                uint32 job_error;
+                spoolss_JobStatus job_error;
                 uint32 number_of_processors;
                 spoolss_ProcessorType processor_type;
@@ -870 +1174 @@
                 uint32 change_id;
                 WERROR last_error;
-                uint32 status;
+                spoolss_PrinterStatus status;
                 uint32 enumerate_network_printers;
                 uint32 c_setprinter;
@@ -988 +1292 @@
 
         typedef [public] struct {
-                [value((ndr_size_spoolss_StringArray(r, ndr->iconv_convenience, ndr->flags)-4)/2)] uint32 _ndr_size;
+                [value((ndr_size_spoolss_StringArray(r, ndr->flags)-4)/2)] uint32 _ndr_size;
                 /*[subcontext(0),subcontext_size(_ndr_size*2)]*/ nstring_array string;
         } spoolss_StringArray;
@@ -1022 +1326 @@
                 [string,charset(UTF16)] uint16 *monitor_name;
                 [string,charset(UTF16)] uint16 *default_datatype;
-                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
+                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
                 spoolss_StringArray *dependent_files;
         } spoolss_AddDriverInfo3;
@@ -1036 +1340 @@
                 [string,charset(UTF16)] uint16 *monitor_name;
                 [string,charset(UTF16)] uint16 *default_datatype;
-                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
+                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
                 spoolss_StringArray *dependent_files;
-                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
+                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
                 spoolss_StringArray *previous_names;
         } spoolss_AddDriverInfo4;
@@ -1068 +1372 @@
                 [string,charset(UTF16)] uint16 *monitor_name;
                 [string,charset(UTF16)] uint16 *default_datatype;
-                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
+                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
                 spoolss_StringArray *dependent_files;
-                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
+                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
                 spoolss_StringArray *previous_names;
                 NTTIME driver_date;
@@ -1090 +1394 @@
                 [string,charset(UTF16)] uint16 *monitor_name;
                 [string,charset(UTF16)] uint16 *default_datatype;
-                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
+                [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
                 spoolss_StringArray *dependent_files;
-                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
+                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
                 spoolss_StringArray *previous_names;
                 NTTIME driver_date;
@@ -1102 +1406 @@
                 [string,charset(UTF16)] uint16 *print_processor;
                 [string,charset(UTF16)] uint16 *vendor_setup;
-                [value(((ndr_size_spoolss_StringArray(color_profiles, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_color_profiles;
+                [value(((ndr_size_spoolss_StringArray(color_profiles, ndr->flags)-4)/2))] uint32 _ndr_size_color_profiles;
                 spoolss_StringArray *color_profiles;
                 [string,charset(UTF16)] uint16 *inf_path;
                 uint32 printer_driver_attributes;
-                [value(((ndr_size_spoolss_StringArray(core_driver_dependencies, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_core_driver_dependencies;
+                [value(((ndr_size_spoolss_StringArray(core_driver_dependencies, ndr->flags)-4)/2))] uint32 _ndr_size_core_driver_dependencies;
                 spoolss_StringArray *core_driver_dependencies;
                 NTTIME min_inbox_driver_ver_date;
@@ -1523 +1827 @@
 
         typedef [public,gensize] struct {
-                [value(ndr_size_spoolss_OSVersion(r,ndr->iconv_convenience,ndr->flags))] uint32 _ndr_size;
+                [value(ndr_size_spoolss_OSVersion(r,ndr->flags))] uint32 _ndr_size;
                 uint32 major;
                 uint32 minor;
@@ -1532 +1836 @@
 
         typedef [public,gensize] struct {
-                [value(ndr_size_spoolss_OSVersionEx(r,ndr->iconv_convenience,ndr->flags))] uint32 _ndr_size;
+                [value(ndr_size_spoolss_OSVersionEx(r,ndr->flags))] uint32 _ndr_size;
                 uint32 major;
                 uint32 minor;
@@ -1622 +1926 @@
         const string SPOOL_REG_VERSIONNUMBER            = "versionNumber";
 
-        WERROR spoolss_GetPrinterData(
+        [public] WERROR spoolss_GetPrinterData(
                 [in,ref] policy_handle *handle,
                 [in]     [string,charset(UTF16)] uint16 value_name[],
@@ -1930 +2234 @@
         /******************/
         /* Function: 0x25 */
+
+        typedef [public,gensize] struct {
+                [string,charset(UTF16)] uint16 *port_name;
+        } spoolss_SetPortInfo1;
+
+        typedef [public,gensize] struct {
+                [string,charset(UTF16)] uint16 *port_name;
+                [string,charset(UTF16)] uint16 *monitor_name;
+                [string,charset(UTF16)] uint16 *description;
+                spoolss_PortType port_type;
+                uint32 reserved;
+        } spoolss_SetPortInfo2;
+
+        typedef [public,gensize] struct {
+                spoolss_PortStatus status;
+                [string,charset(UTF16)] uint16 *status_string;
+                spoolss_PortSeverity severity;
+        } spoolss_SetPortInfo3;
+
+        typedef [public,gensize] struct {
+                [string,charset(UTF16)] uint16 *port_name;
+                DATA_BLOB monitor_data; /* relative ?? */
+        } spoolss_SetPortInfoFF;
+
+        typedef [switch_type(uint32)] union {
+                [case(1)] spoolss_SetPortInfo1 *info1;
+                [case(2)] spoolss_SetPortInfo2 *info2;
+                [case(3)] spoolss_SetPortInfo3 *info3;
+                [case(0xff)] spoolss_SetPortInfoFF *infoFF;
+        } spoolss_SetPortInfo;
+
+        typedef struct {
+                uint32 level;
+                [switch_is(level)] spoolss_SetPrinterInfo info;
+        } spoolss_SetPortInfoContainer;
+
         WERROR spoolss_AddPort(
                [in,unique] [string,charset(UTF16)] uint16 *server_name,
@@ -1943 +2283 @@
         /******************/
         /* Function: 0x27 */
-        [todo] WERROR spoolss_DeletePort(
+        WERROR spoolss_DeletePort(
+               [in,unique] [string,charset(UTF16)] uint16 *server_name,
+               [in] uint32 ptr,
+               [in,ref] [string,charset(UTF16)] uint16 *port_name
         );
 
@@ -2055 +2398 @@
         /******************/
         /* Function: 0x35 */
-        WERROR spoolss_GetPrinterDriver2(
+        [public] WERROR spoolss_GetPrinterDriver2(
                 [in,ref] policy_handle *handle,
                 [in,unique] [string,charset(UTF16)] uint16 *architecture,
@@ -2167 +2510 @@
         /******************/
         /* Function: 0x3d */
-        [todo] WERROR spoolss_AddPortEx(
+
+        typedef struct {
+                uint32 monitor_data_size;
+                [size_is(monitor_data_size),unique] uint8 *monitor_data;
+        } spoolss_PortVarContainer;
+
+        WERROR spoolss_AddPortEx(
+                [in,unique] [string,charset(UTF16)] uint16 *servername,
+                [in,ref] spoolss_SetPortInfoContainer *port_ctr,
+                [in,ref] spoolss_PortVarContainer *port_var_ctr,
+                [in,unique] [string,charset(UTF16)] uint16 *monitor_name
         );
 
@@ -2482 +2835 @@
         /******************/
         /* Function: 0x47 */
-        [todo] WERROR spoolss_47(
+        WERROR spoolss_SetPort(
+                [in,unique] [string,charset(UTF16)] uint16 *servername,
+                [in,unique] [string,charset(UTF16)] uint16 *port_name,
+                [in,ref] spoolss_SetPortInfoContainer *port_ctr
         );
 
@@ -2631 +2987 @@
         /******************/
         /* Function: 0x55 */
-        [todo] WERROR spoolss_55(
+        WERROR spoolss_AddPerMachineConnection(
+                [in,unique] [string,charset(UTF16)] uint16 *server,
+                [in,ref] [string,charset(UTF16)] uint16 *printername,
+                [in,ref] [string,charset(UTF16)] uint16 *printserver,
+                [in,ref] [string,charset(UTF16)] uint16 *provider
         );
 
         /******************/
         /* Function: 0x56 */
-        [todo] WERROR spoolss_56(
+        WERROR spoolss_DeletePerMachineConnection(
+                [in,unique] [string,charset(UTF16)] uint16 *server,
+                [in,ref] [string,charset(UTF16)] uint16 *printername
         );
 
         /******************/
         /* Function: 0x57 */
-        [todo] WERROR spoolss_57(
+        [todo] WERROR spoolss_EnumPerMachineConnections(
         );
 

trunk/server/librpc/idl/srvsvc.idl

@@ -4 +4 @@
   srvsvc interface definitions
 */
-import "security.idl", "svcctl.idl";
+import "misc.idl", "security.idl", "svcctl.idl";
 
 [ uuid("4b324fc8-1670-01d3-1278-5a47bf6ee188"),

trunk/server/librpc/idl/winreg.idl

@@ -113 +113 @@
         } winreg_SecBuf;
 
+        const int REG_OPTION_NON_VOLATILE = 0x00000000;
+
+        typedef [bitmap32bit] bitmap {
+                REG_OPTION_VOLATILE             = 0x00000001,
+                REG_OPTION_CREATE_LINK          = 0x00000002,
+                REG_OPTION_BACKUP_RESTORE       = 0x00000004,
+                REG_OPTION_OPEN_LINK            = 0x00000008
+        } winreg_KeyOptions;
+
         typedef [v1_enum] enum {
                 REG_ACTION_NONE         = 0, /* used by caller */
@@ -123 +132 @@
                 [in] winreg_String name,
                 [in] winreg_String keyclass,
-                [in] uint32 options,
+                [in] winreg_KeyOptions options,
                 [in] winreg_AccessMask access_mask,
                 [in,unique] winreg_SecBuf *secdesc,
@@ -180 +189 @@
                 [in,out,ref]    winreg_ValNameBuf *name,
                 [in,out,unique] winreg_Type *type,
-                [in,out,unique,size_is(*size),length_is(*length)] uint8 *value,
+                [in,out,unique,size_is(size ? *size : 0),length_is(length ? *length : 0),range(0,0x4000000)] uint8 *value,
                 [in,out,unique] uint32 *size,
                 [in,out,unique] uint32 *length
@@ -231 +240 @@
                 [in,ref] policy_handle *parent_handle,
                 [in] winreg_String keyname,
-                [in] uint32 unknown,
+                [in] winreg_KeyOptions options,
                 [in] winreg_AccessMask access_mask,
                 [out,ref] policy_handle *handle
@@ -264 +273 @@
         /******************/
         /* Function: 0x12 */
-        [todo] WERROR winreg_ReplaceKey(
+        WERROR winreg_ReplaceKey(
+                [in,ref] policy_handle *handle,
+                [in,ref] winreg_String *subkey,
+                [in,ref] winreg_String *new_file,
+                [in,ref] winreg_String *old_file
         );
 
         /******************/
         /* Function: 0x13 */
+
+        typedef [public,bitmap32bit] bitmap {
+                REG_WHOLE_HIVE_VOLATILE         = 0x00000001,
+                REG_REFRESH_HIVE                = 0x00000002,
+                REG_NO_LAZY_FLUSH               = 0x00000004,
+                REG_FORCE_RESTORE               = 0x00000008
+        } winreg_RestoreKeyFlags;
+
         WERROR winreg_RestoreKey(
                 [in,ref] policy_handle *handle,
                 [in,ref] winreg_String *filename,
-                [in]     uint32 flags 
+                [in]     winreg_RestoreKeyFlags flags
         );
 
@@ -310 +331 @@
         /******************/
         /* Function: 0x17 */
-        [todo] WERROR winreg_UnLoadKey(
+        WERROR winreg_UnLoadKey(
+                [in,ref] policy_handle *handle,
+                [in,ref] winreg_String *subkey
         );
 
@@ -357 +380 @@
 
         typedef struct {
-                winreg_String *name;
-                winreg_Type type;
-                uint32 offset;
-                uint32 length;
+                winreg_ValNameBuf *ve_valuename;
+                uint32 ve_valuelen;
+                uint32 ve_valueptr;
+                winreg_Type ve_type;
         } QueryMultipleValue;
-        
+
         /******************/
         /* Function: 0x1d */
         [public] WERROR winreg_QueryMultipleValues(
                 [in,ref] policy_handle *key_handle, 
-                [in,out,ref,size_is(num_values),length_is(num_values)] QueryMultipleValue *values,
+                [in,ref,size_is(num_values),length_is(num_values)] QueryMultipleValue *values_in,
+                [out,ref,size_is(num_values),length_is(num_values)] QueryMultipleValue *values_out,
                 [in] uint32 num_values,
                 [in,out,unique,size_is(*buffer_size),length_is(*buffer_size)] uint8 *buffer,
@@ -390 +414 @@
         /******************/
         /* Function: 0x1f */
-        [todo] WERROR winreg_SaveKeyEx(
+        WERROR winreg_SaveKeyEx(
+                [in,ref] policy_handle *handle,
+                [in,ref] winreg_String *filename,
+                [in,unique] KeySecurityAttribute *sec_attrib,
+                [in] uint32 flags
         );
 
@@ -411 +439 @@
         /******************/
         /* Function: 0x22 */
-        [todo] WERROR winreg_QueryMultipleValues2(
+        [public] WERROR winreg_QueryMultipleValues2(
+                [in,ref] policy_handle *key_handle,
+                [in,ref,size_is(num_values),length_is(num_values)] QueryMultipleValue *values_in,
+                [out,ref,size_is(num_values),length_is(num_values)] QueryMultipleValue *values_out,
+                [in] uint32 num_values,
+                [in,out,unique,size_is(*offered),length_is(*offered)] uint8 *buffer,
+                [in,ref] uint32 *offered,
+                [out,ref] uint32 *needed
+        );
+
+        /******************/
+        /* Function: 0x23 */
+        WERROR winreg_DeleteKeyEx(
+                [in,ref] policy_handle *handle,
+                [in,ref] winreg_String *key,
+                [in] winreg_AccessMask access_mask,
+                [in] uint32 reserved
         );
 }

trunk/server/librpc/idl/wmi.idl

@@ -9 +9 @@
 
 [
-        helper("librpc/ndr/ndr_wmi.h"),
         uuid("8BC3F05E-D86B-11d0-A075-00C04FB68820")
 ] coclass WbemLevel1Login
@@ -18 +17 @@
 
 [
-        local, 
-        object, 
+        local,
+        object,
         uuid("dc12a681-737f-11cf-884d-00aa004b2e24")
 ]
@@ -204 +203 @@
     }   WBEMSTATUS;
 
-    typedef [public,noprint] enum
+    typedef [public] bitmap
     {
         WBEM_FLAG_RETURN_WBEM_COMPLETE          = 0,
@@ -226 +225 @@
     } WBEM_GENERIC_FLAG_TYPE;
 
-    typedef [public,noprint,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
+    typedef [public,v1_enum] enum tag_WBEM_TIMEOUT_TYPE
     {
         WBEM_NO_WAIT = 0,
@@ -280 +279 @@
         WBEM_FLAVOR_FLAG_PROPAGATE_TO_INSTANCE = 0x1,
         WBEM_FLAVOR_FLAG_PROPAGATE_TO_DERIVED_CLASS = 0x2,
-//        WBEM_FLAVOR_MASK_PROPAGATION = 0x0F,
+/*        WBEM_FLAVOR_MASK_PROPAGATION = 0x0F, */
 
         WBEM_FLAVOR_NOT_OVERRIDABLE = 0x10,
-//        WBEM_FLAVOR_MASK_PERMISSIONS = 0x10,
+/*        WBEM_FLAVOR_MASK_PERMISSIONS = 0x10, */
 
         WBEM_FLAVOR_ORIGIN_PROPAGATED = 0x20,
         WBEM_FLAVOR_ORIGIN_SYSTEM = 0x40,
-//        WBEM_FLAVOR_MASK_ORIGIN = 0x60,
+/*        WBEM_FLAVOR_MASK_ORIGIN = 0x60, */
 
         WBEM_FLAVOR_AMENDED = 0x80
-//        WBEM_FLAVOR_MASK_AMENDED = 0x80
+/*        WBEM_FLAVOR_MASK_AMENDED = 0x80 */
 
     } WBEM_FLAVOR_TYPE;
@@ -300 +299 @@
                 WCF_CLASS = 4,
                 WCF_CLASS_PART_INTERNAL = 8
-        //      WCF_CLASS_PART_SHARED = 0x104
-    } WCO_FLAGS;
-
-    typedef [public,nopull,nopush] struct
-    {
+        /*      WCF_CLASS_PART_SHARED = 0x104 */
+        } WCO_FLAGS;
+
+        typedef struct
+        {
                 uint32 count;
                 [ref,charset(UTF16)] uint16 *item[count];
-    } CIMSTRINGS;
-
-    typedef [public,bitmap8bit] bitmap {
-        DEFAULT_FLAG_EMPTY = 1,
-        DEFAULT_FLAG_INHERITED = 2
-    } DEFAULT_FLAGS;
+        } CIMSTRINGS;
+
+        typedef [public,bitmap8bit] bitmap {
+                DEFAULT_FLAG_EMPTY = 1,
+                DEFAULT_FLAG_INHERITED = 2
+        } DEFAULT_FLAGS;
 
         WERROR OpenNamespace(
@@ -421 +420 @@
 
     WERROR CreateInstanceEnum(
-        [in] BSTR strFilter,          // allow more things than a class name
+        [in] BSTR strFilter,          /* allow more things than a class name */
         [in] long lFlags,
         [in,unique]  IWbemContext* pCtx,
@@ -526 +525 @@
 
     WERROR GetNames(
-//        [in] long lFlags,
-//        [out] SAFEARRAY (BSTR)* pNames
+/*        [in] long lFlags, */
+/*        [out] SAFEARRAY (BSTR)* pNames */
         );
 
@@ -533 +532 @@
 
     WERROR Next(
-//        [in]  long lFlags,
-//        [out] BSTR* pstrName,
-//        [out] VARIANT* pValue
+/*        [in]  long lFlags, */
+/*        [out] BSTR* pstrName, */
+/*        [out] VARIANT* pValue */
         );
 
@@ -542 +541 @@
 
     WERROR SetValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags
-//        [in] VARIANT* pValue
+/*        [in, string] LPCWSTR wszName, */
+/*        [in] long lFlags */
+/*        [in] VARIANT* pValue */
         );
 
     WERROR GetValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags,
-//        [out] VARIANT* pValue
+/*        [in, string] LPCWSTR wszName, */
+/*        [in] long lFlags, */
+/*        [out] VARIANT* pValue */
         );
 
     WERROR DeleteValue(
-//        [in, string] LPCWSTR wszName,
-//        [in] long lFlags
+/*        [in, string] LPCWSTR wszName, */
+/*        [in] long lFlags */
         );
 
@@ -614 +613 @@
 
         typedef [relative_base] struct {
-                //      [relative] WBEMDATA4 *data; /* 0x9 */
+                /*      [relative] WBEMDATA4 *data; */ /* 0x9 */
                 uint32 data_size;
                 uint8 wtype;
@@ -654 +653 @@
                 [out,ref] uint32 *puReturned,
                 [out,ref] uint32 *pSize,
-                [out,ref,noprint,size_is(,*pSize)] uint8 **pData
+                [out,ref,size_is(,*pSize)] uint8 **pData
                 );
 }
@@ -670 +669 @@
 [
         object,
-        //      restricted,
+        /*      restricted, */
         uuid(44aca675-e8fc-11d0-a07c-00c04fb68820)
 ] interface IWbemCallResult : IUnknown

trunk/server/librpc/idl/xattr.idl

@@ -15 +15 @@
   version(0.0),
   helper("../librpc/ndr/ndr_xattr.h"),
+  pyhelper("librpc/ndr/py_xattr.c"),
   pointer_default(unique)
 ]