diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-01-17 21:59:56 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-01-18 07:25:18 +1100 |
| commit | f461a72ec3aa990c357b754b5311add4bba48485 (patch) | |
| tree | 5e0a9fb68e12bb54e3285e7a968d1f4d2c012b31 /source3 | |
| parent | aa362e8e68b317fcc4fecbe44f62750e8cee6d32 (diff) | |
| download | samba-f461a72ec3aa990c357b754b5311add4bba48485.tar.gz samba-f461a72ec3aa990c357b754b5311add4bba48485.tar.bz2 samba-f461a72ec3aa990c357b754b5311add4bba48485.zip | |
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.
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libnet/libnet_dssync.c | 10 | ||||
| -rw-r--r-- | source3/rpcclient/cmd_drsuapi.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c index 5213be0587..3b66979caa 100644 --- a/source3/libnet/libnet_dssync.c +++ b/source3/libnet/libnet_dssync.c @@ -312,11 +312,11 @@ static NTSTATUS libnet_dssync_build_request(TALLOC_CTX *mem_ctx, struct drsuapi_DsReplicaObjectIdentifier *nc = NULL; struct drsuapi_DsReplicaCursorCtrEx *cursors = NULL; - uint32_t replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE | - DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP | - DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS | - DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS | - DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED; + uint32_t replica_flags = DRSUAPI_DRS_WRIT_REP | + DRSUAPI_DRS_INIT_SYNC | + DRSUAPI_DRS_PER_SYNC | + DRSUAPI_DRS_GET_ANC | + DRSUAPI_DRS_NEVER_SYNCED; ZERO_STRUCT(null_sid); ZERO_STRUCT(req); diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c index b2939d4a23..e11922a9f8 100644 --- a/source3/rpcclient/cmd_drsuapi.c +++ b/source3/rpcclient/cmd_drsuapi.c @@ -322,11 +322,11 @@ static WERROR cmd_drsuapi_getncchanges(struct rpc_pipe_client *cli, int y; uint32_t supported_extensions = 0; - uint32_t replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE | - DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP | - DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS | - DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS | - DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED; + uint32_t replica_flags = DRSUAPI_DRS_WRIT_REP | + DRSUAPI_DRS_INIT_SYNC | + DRSUAPI_DRS_PER_SYNC | + DRSUAPI_DRS_GET_ANC | + DRSUAPI_DRS_NEVER_SYNCED; if (argc > 3) { printf("usage: %s [naming_context_or_object_dn [single]]\n", argv[0]); |