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 /source4/torture/rpc | |
| 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 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/drsuapi.c | 14 | ||||
| -rw-r--r-- | source4/torture/rpc/dssync.c | 24 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 0496d625a1..cd28befe61 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -573,7 +573,7 @@ static bool test_DsGetNCChanges(struct torture_context *tctx, r.in.req->req5.uptodateness_vector = NULL; r.in.req->req5.replica_flags = 0; if (lp_parm_bool(tctx->lp_ctx, NULL, "drsuapi", "compression", false)) { - r.in.req->req5.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + r.in.req->req5.replica_flags |= DRSUAPI_DRS_USE_COMPRESSION; } r.in.req->req5.max_object_count = 0; r.in.req->req5.max_ndr_size = 0; @@ -596,15 +596,15 @@ static bool test_DsGetNCChanges(struct torture_context *tctx, r.in.req->req8.uptodateness_vector = NULL; r.in.req->req8.replica_flags = 0; if (lp_parm_bool(tctx->lp_ctx, NULL, "drsuapi", "compression", false)) { - r.in.req->req8.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + r.in.req->req8.replica_flags |= DRSUAPI_DRS_USE_COMPRESSION; } if (lp_parm_bool(tctx->lp_ctx, NULL, "drsuapi", "neighbour_writeable", true)) { - r.in.req->req8.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE; + r.in.req->req8.replica_flags |= DRSUAPI_DRS_WRIT_REP; } - r.in.req->req8.replica_flags |= 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 + r.in.req->req8.replica_flags |= DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_GET_ANC + | DRSUAPI_DRS_NEVER_SYNCED ; r.in.req->req8.max_object_count = 402; r.in.req->req8.max_ndr_size = 402116; diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c index 220db7b50c..94a70ed7b1 100644 --- a/source4/torture/rpc/dssync.c +++ b/source4/torture/rpc/dssync.c @@ -799,15 +799,15 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx) r.in.req->req5.uptodateness_vector = NULL; r.in.req->req5.replica_flags = 0; if (lp_parm_bool(tctx->lp_ctx, NULL, "dssync", "compression", false)) { - r.in.req->req5.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + r.in.req->req5.replica_flags |= DRSUAPI_DRS_USE_COMPRESSION; } if (lp_parm_bool(tctx->lp_ctx, NULL, "dssync", "neighbour_writeable", true)) { - r.in.req->req5.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE; + r.in.req->req5.replica_flags |= DRSUAPI_DRS_WRIT_REP; } - r.in.req->req5.replica_flags |= 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 + r.in.req->req5.replica_flags |= DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_GET_ANC + | DRSUAPI_DRS_NEVER_SYNCED ; r.in.req->req5.max_object_count = 133; r.in.req->req5.max_ndr_size = 1336770; @@ -831,15 +831,15 @@ static bool test_FetchData(struct torture_context *tctx, struct DsSyncTest *ctx) r.in.req->req8.uptodateness_vector = NULL; r.in.req->req8.replica_flags = 0; if (lp_parm_bool(tctx->lp_ctx, NULL, "dssync", "compression", false)) { - r.in.req->req8.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + r.in.req->req8.replica_flags |= DRSUAPI_DRS_USE_COMPRESSION; } if (lp_parm_bool(tctx->lp_ctx, NULL, "dssync", "neighbour_writeable", true)) { - r.in.req->req8.replica_flags |= DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE; + r.in.req->req8.replica_flags |= DRSUAPI_DRS_WRIT_REP; } - r.in.req->req8.replica_flags |= 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 + r.in.req->req8.replica_flags |= DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_GET_ANC + | DRSUAPI_DRS_NEVER_SYNCED ; r.in.req->req8.max_object_count = 402; r.in.req->req8.max_ndr_size = 402116; |