Revert "IDL: Fix several DRSUAPI calls."

This reverts commit aa7308fbc37eb9a26b4583b1ce2ca435b0648541.

diff --git a/source/librpc/idl/drsuapi.idl b/source/librpc/idl/drsuapi.idl
index 80d800c533c6b35023cc4f82dec76e171846186b..fb24122e262703e68185a70d1e31d03fd608d4dc 100644 (file)
--- a/source/librpc/idl/drsuapi.idl
+++ b/source/librpc/idl/drsuapi.idl
@@ -627,8 +627,8 @@ interface drsuapi
        WERROR drsuapi_DsGetNCChanges(
                [in] policy_handle *bind_handle,
                [in,out,ref] int32 *level,
-               [in,ref,switch_is(*level)] drsuapi_DsGetNCChangesRequest *req,
-               [out,ref,switch_is(*level)] drsuapi_DsGetNCChangesCtr *ctr
+               [in,switch_is(*level)] drsuapi_DsGetNCChangesRequest req,
+               [out,switch_is(*level)] drsuapi_DsGetNCChangesCtr ctr
                );
 
        /*****************/
@@ -734,10 +734,9 @@ interface drsuapi
 
        WERROR drsuapi_DsGetMemberships(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref] [switch_is(level)] drsuapi_DsGetMembershipsRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref] [switch_is(*level_out)] drsuapi_DsGetMembershipsCtr *ctr
+               [in,out] int32 level,
+               [in] [switch_is(level)] drsuapi_DsGetMembershipsRequest req,
+               [out] [switch_is(level)] drsuapi_DsGetMembershipsCtr ctr
                );
 
        /*****************/
@@ -777,10 +776,9 @@ interface drsuapi
 
        WERROR drsuapi_DsGetNT4ChangeLog(
                [in] policy_handle *bind_handle,
-               [in] uint32 level,
-               [in,ref] [switch_is(level)] drsuapi_DsGetNT4ChangeLogRequest *req,
-               [out,ref] uint32 *level_out,
-               [out,ref] [switch_is(*level_out)] drsuapi_DsGetNT4ChangeLogInfo *info
+               [in,out] uint32 level,
+               [in] [switch_is(level)] drsuapi_DsGetNT4ChangeLogRequest req,
+               [out] [switch_is(level)] drsuapi_DsGetNT4ChangeLogInfo info
                );
 
        /*****************/
@@ -853,10 +851,9 @@ interface drsuapi
 
        WERROR drsuapi_DsCrackNames(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref,switch_is(level)] drsuapi_DsNameRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref,switch_is(*level_out)] drsuapi_DsNameCtr *ctr
+               [in, out] int32 level,
+               [in,switch_is(level)] drsuapi_DsNameRequest req,
+               [out,switch_is(level)] drsuapi_DsNameCtr ctr
                );
 
        /*****************/
@@ -889,10 +886,9 @@ interface drsuapi
 
        WERROR drsuapi_DsWriteAccountSpn(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref,switch_is(level)] drsuapi_DsWriteAccountSpnRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref,switch_is(*level_out)] drsuapi_DsWriteAccountSpnResult *res
+               [in,out] int32 level,
+               [in,switch_is(level)] drsuapi_DsWriteAccountSpnRequest req,
+               [out,switch_is(level)] drsuapi_DsWriteAccountSpnResult res
                );
 
        /*****************/
@@ -917,10 +913,9 @@ interface drsuapi
 
        WERROR drsuapi_DsRemoveDSServer(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref,switch_is(level)] drsuapi_DsRemoveDSServerRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref,switch_is(*level_out)] drsuapi_DsRemoveDSServerResult *res
+               [in,out] int32 level,
+               [in,switch_is(level)] drsuapi_DsRemoveDSServerRequest req,
+               [out,switch_is(level)] drsuapi_DsRemoveDSServerResult res
                );
 
        /*****************/
@@ -1018,9 +1013,9 @@ interface drsuapi
        WERROR drsuapi_DsGetDomainControllerInfo(
                [in] policy_handle *bind_handle,
                [in] int32 level,
-               [in,ref,switch_is(level)] drsuapi_DsGetDCInfoRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref,switch_is(*level_out)] drsuapi_DsGetDCInfoCtr *ctr
+               [in,switch_is(level)] drsuapi_DsGetDCInfoRequest req,
+               [out] int32 level_out,
+               [out,switch_is(level_out)] drsuapi_DsGetDCInfoCtr ctr
                );
 
        /*****************/
@@ -1136,10 +1131,9 @@ interface drsuapi
 
        [public] WERROR drsuapi_DsAddEntry(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref,switch_is(level)] drsuapi_DsAddEntryRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref,switch_is(*level_out)] drsuapi_DsAddEntryCtr *ctr
+               [in,out] int32 level,
+               [in,switch_is(level)] drsuapi_DsAddEntryRequest req,
+               [out,switch_is(level)] drsuapi_DsAddEntryCtr ctr
                );
 
        /*****************/
@@ -1263,7 +1257,7 @@ interface drsuapi
        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_DELETE)]       drsuapi_DsReplicaDeleteOptions 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;
@@ -1418,9 +1412,9 @@ interface drsuapi
        WERROR drsuapi_DsReplicaGetInfo(
                [in] policy_handle *bind_handle,
                [in] drsuapi_DsReplicaGetInfoLevel level,
-               [in,ref,switch_is(level)] drsuapi_DsReplicaGetInfoRequest *req,
-               [out,ref] drsuapi_DsReplicaInfoType *info_type,
-               [out,ref,switch_is(*info_type)] drsuapi_DsReplicaInfo *info
+               [in,switch_is(level)] drsuapi_DsReplicaGetInfoRequest req,
+               [out] drsuapi_DsReplicaInfoType info_type,
+               [out,switch_is(info_type)] drsuapi_DsReplicaInfo info
                );
 
        /*****************/
@@ -1450,10 +1444,9 @@ interface drsuapi
 
        WERROR drsuapi_DsGetMemberships2(
                [in] policy_handle *bind_handle,
-               [in] int32 level,
-               [in,ref] [switch_is(level)] drsuapi_DsGetMemberships2Request *req,
-               [out,ref] int32 *level_out,
-               [out,ref] [switch_is(*level_out)] drsuapi_DsGetMemberships2Ctr *ctr
+               [in,out] int32 level,
+               [in] [switch_is(level)] drsuapi_DsGetMemberships2Request req,
+               [out] [switch_is(level)] drsuapi_DsGetMemberships2Ctr ctr
                );
 
 
@@ -1496,8 +1489,8 @@ interface drsuapi
        WERROR drsuapi_QuerySitesByCost(
                [in] policy_handle *bind_handle,
                [in] int32 level,
-               [in,ref] [switch_is(level)] drsuapi_QuerySitesByCostRequest *req,
-               [out,ref] int32 *level_out,
-               [out,ref] [switch_is(*level_out)] drsuapi_QuerySitesByCostCtr *ctr
+               [in] [switch_is(level)] drsuapi_QuerySitesByCostRequest req,
+               [out] int32 level_out,
+               [out] [switch_is(level_out)] drsuapi_QuerySitesByCostCtr ctr
        );
 }