idl: switched to using the WSPP names for the 'neighbour' DRS options

The documentation shows that all these functions in fact use the same
flags variable type. To be consistent between functions, and to allow
easy reference to the WSPP docs, it is better for us to also use this
generic DrsOptions bitfield rather than one per operations.

2 files changed, 7 insertions, 44 deletions

diff --git a/librpc/idl/drsblobs.idl b/librpc/idl/drsblobs.idl
index 97f3b2de0b..8a1e401d1b 100644
--- a/librpc/idl/drsblobs.idl
+++ b/librpc/idl/drsblobs.idl
@@ -11,7 +11,7 @@ import "drsuapi.idl", "misc.idl", "samr.idl", "lsa.idl";
 ]
 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;
 	/*
@@ -100,7 +100,7 @@ interface drsblobs {
 		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;
+		drsuapi_DrsOptions replica_flags;
 		uint8 schedule[84];
 		[value(0)] uint32 reserved;
 		drsuapi_DsReplicaHighWaterMark highwatermark;
@@ -127,7 +127,7 @@ interface drsblobs {
 		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;
+		drsuapi_DrsOptions replica_flags;
 		uint8 schedule[84];
 		[value(0)] uint32 reserved;
 		drsuapi_DsReplicaHighWaterMark highwatermark;
diff --git a/librpc/idl/drsuapi.idl b/librpc/idl/drsuapi.idl
index b538b7ca77..64f82cb28d 100644
--- a/librpc/idl/drsuapi.idl
+++ b/librpc/idl/drsuapi.idl
@@ -257,43 +257,6 @@ interface drsuapi
 		[size_is(count)] drsuapi_DsReplicaCursor cursors[];
 	} drsuapi_DsReplicaCursorCtrEx;
 
-	typedef [public] bitmap {
-		/* the _WRITEABLE flag indicates a replication with all attributes
-		 *
-		 * --metze
-		 *
-		 * See drsuapi_DrsOptions for the WSPP bit names 
-		 */
-		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 {
 		DRSUAPI_EXOP_NONE				= 0x00000000,
 		DRSUAPI_EXOP_FSMO_REQ_ROLE			= 0x00000001,
@@ -331,7 +294,7 @@ interface drsuapi
 		[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
 		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 */
 		drsuapi_DsExtendedOperation extended_op;
@@ -533,7 +496,7 @@ interface drsuapi
 		[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
 		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 */
 		drsuapi_DsExtendedOperation extended_op;
@@ -549,7 +512,7 @@ interface drsuapi
 		[ref] drsuapi_DsReplicaObjectIdentifier *naming_context;
 		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 */
 		drsuapi_DsExtendedOperation extended_op;
@@ -1432,7 +1395,7 @@ interface drsuapi
 		[charset(UTF16),string] uint16 *source_dsa_obj_dn;
 		[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;
 		GUID source_dsa_obj_guid;