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/libnet | |
| 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/libnet')
| -rw-r--r-- | source4/libnet/libnet_become_dc.c | 36 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.c | 12 |
2 files changed, 24 insertions, 24 deletions
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c index b971e43dd7..baaa46b524 100644 --- a/source4/libnet/libnet_become_dc.c +++ b/source4/libnet/libnet_become_dc.c @@ -2576,12 +2576,12 @@ static void becomeDC_drsuapi3_pull_schema_send(struct libnet_BecomeDC_state *s) s->schema_part.destination_dsa_guid = s->drsuapi2.bind_guid; - s->schema_part.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_FULL_IN_PROGRESS - | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED - | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + s->schema_part.replica_flags = DRSUAPI_DRS_WRIT_REP + | DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS + | DRSUAPI_DRS_NEVER_SYNCED + | DRSUAPI_DRS_USE_COMPRESSION; s->schema_part.store_chunk = s->callbacks.schema_chunk; @@ -2640,12 +2640,12 @@ static void becomeDC_drsuapi3_pull_config_send(struct libnet_BecomeDC_state *s) s->config_part.destination_dsa_guid = s->drsuapi2.bind_guid; - s->config_part.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_FULL_IN_PROGRESS - | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED - | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + s->config_part.replica_flags = DRSUAPI_DRS_WRIT_REP + | DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS + | DRSUAPI_DRS_NEVER_SYNCED + | DRSUAPI_DRS_USE_COMPRESSION; s->config_part.store_chunk = s->callbacks.config_chunk; @@ -2702,12 +2702,12 @@ static void becomeDC_drsuapi3_pull_domain_send(struct libnet_BecomeDC_state *s) s->domain_part.destination_dsa_guid = s->drsuapi2.bind_guid; - s->domain_part.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_FULL_IN_PROGRESS - | DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED - | DRSUAPI_DS_REPLICA_NEIGHBOUR_COMPRESS_CHANGES; + s->domain_part.replica_flags = DRSUAPI_DRS_WRIT_REP + | DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC + | DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS + | DRSUAPI_DRS_NEVER_SYNCED + | DRSUAPI_DRS_USE_COMPRESSION; s->domain_part.store_chunk = s->callbacks.domain_chunk; diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 37a9d7e72d..e38488771e 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -205,9 +205,9 @@ static NTSTATUS vampire_apply_schema(struct vampire_state *s, return NT_STATUS_INVALID_PARAMETER; } - s_dsa->replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE - | DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP - | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS; + s_dsa->replica_flags = DRSUAPI_DRS_WRIT_REP + | DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC; memset(s_dsa->schedule, 0x11, sizeof(s_dsa->schedule)); tmp_dns_name = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid); @@ -512,9 +512,9 @@ static NTSTATUS vampire_store_chunk(void *private_data, return NT_STATUS_INVALID_PARAMETER; } - s_dsa->replica_flags = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE - | DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP - | DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS; + s_dsa->replica_flags = DRSUAPI_DRS_WRIT_REP + | DRSUAPI_DRS_INIT_SYNC + | DRSUAPI_DRS_PER_SYNC; memset(s_dsa->schedule, 0x11, sizeof(s_dsa->schedule)); tmp_dns_name = GUID_string(s_dsa->other_info, &s_dsa->source_dsa_obj_guid); |