s3-idl: merge from s4 drsuapi.idl.

Guenther

diff --git a/source3/librpc/idl/drsuapi.idl b/source3/librpc/idl/drsuapi.idl
index df6dcba23ab4dc27c2b7198b0faa5eed53f3844b..adcd2d741b0d0668db697a46da403ab3499c490c 100644 (file)
--- a/source3/librpc/idl/drsuapi.idl
+++ b/source3/librpc/idl/drsuapi.idl
@@ -629,36 +629,44 @@ interface drsuapi
                WERROR drs_error;
        } drsuapi_DsGetNCChangesCtr6;
 
-       typedef struct {
+       typedef [public] struct {
+               [subcontext(0xFFFFFC01)] drsuapi_DsGetNCChangesCtr1 ctr1;
+       } drsuapi_DsGetNCChangesCtr1TS;
+
+       typedef [public] struct {
+               [subcontext(0xFFFFFC01)] drsuapi_DsGetNCChangesCtr6 ctr6;
+       } drsuapi_DsGetNCChangesCtr6TS;
+
+       typedef [nopush] struct {
                uint32 decompressed_length;
                uint32 compressed_length;
                [subcontext(4),subcontext_size(compressed_length),
                 compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
-                drsuapi_DsGetNCChangesCtr1 *ctr1;
+                drsuapi_DsGetNCChangesCtr1TS *ts;
        } drsuapi_DsGetNCChangesMSZIPCtr1;
 
-       typedef struct {
+       typedef [nopush] struct {
                uint32 decompressed_length;
                uint32 compressed_length;
                [subcontext(4),subcontext_size(compressed_length),
                 compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)]
-                drsuapi_DsGetNCChangesCtr6 *ctr6;
+                drsuapi_DsGetNCChangesCtr6TS *ts;
        } drsuapi_DsGetNCChangesMSZIPCtr6;
 
-       typedef struct {
+       typedef [nopush] struct {
                uint32 decompressed_length;
                uint32 compressed_length;
                [subcontext(4),subcontext_size(compressed_length),
                 compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length)]
-                drsuapi_DsGetNCChangesCtr1 *ctr1;
+                drsuapi_DsGetNCChangesCtr1TS *ts;
        } drsuapi_DsGetNCChangesXPRESSCtr1;
 
-       typedef struct {
+       typedef [nopush] struct {
                uint32 decompressed_length;
                uint32 compressed_length;
                [subcontext(4),subcontext_size(compressed_length),
                 compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length)]
-                drsuapi_DsGetNCChangesCtr6 *ctr6;
+                drsuapi_DsGetNCChangesCtr6TS *ts;
        } drsuapi_DsGetNCChangesXPRESSCtr6;
 
        typedef [enum16bit] enum {
@@ -674,13 +682,7 @@ interface drsuapi
        } drsuapi_DsGetNCChangesCompressedCtr;
 
        typedef struct {
-               /* 
-                * this is a bit ugly, as the compression depends on the flags
-                * in the DsBind(), but only w2k uses DsGetNCChangesReq5
-                * and will get DsGetNCChangesCtr2 replies, and w2k only knowns
-                * about MSZIP and level 1 replies
-                */
-               [switch_is(1|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16))] drsuapi_DsGetNCChangesCompressedCtr ctr;
+               drsuapi_DsGetNCChangesMSZIPCtr1 mszip1;
        } drsuapi_DsGetNCChangesCtr2;
 
        typedef struct {
@@ -973,7 +975,7 @@ interface drsuapi
        typedef struct {
                [charset(UTF16),string] uint16 *server_dn;
                [charset(UTF16),string] uint16 *domain_dn;
-               uint32 unknown; /* 0x000000001 */
+               boolean32 commit;
        } drsuapi_DsRemoveDSServerRequest1;
 
        typedef [switch_type(int32)] union {
@@ -981,7 +983,7 @@ interface drsuapi
        } drsuapi_DsRemoveDSServerRequest;
 
        typedef struct {
-               WERROR status;
+               boolean32 last_dc_in_domain;
        } drsuapi_DsRemoveDSServerResult1;
 
        typedef [switch_type(int32)] union {