diff options
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/kcc/kcc_drs_replica_info.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/kcc/kcc_periodic.c | 6 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_notify.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_out_pull.c | 4 | ||||
| -rw-r--r-- | source4/dsdb/repl/drepl_partitions.c | 6 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/util.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c index ac22312a0ce..52c36cabb0a 100644 --- a/source4/dsdb/kcc/kcc_drs_replica_info.c +++ b/source4/dsdb/kcc/kcc_drs_replica_info.c @@ -629,8 +629,8 @@ static WERROR kccdrs_replica_get_info_neighbours(TALLOC_CTX *mem_ctx, } if (GUID_all_zero(&req_src_dsa_guid) || - GUID_compare(&req_src_dsa_guid, &reps_from->source_dsa_obj_guid) == 0) - { + GUID_equal(&req_src_dsa_guid, + &reps_from->source_dsa_obj_guid)) { if (i >= base_index) { struct drsuapi_DsReplicaNeighbour neigh; diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c index 4db4d4ee704..34bae96c90e 100644 --- a/source4/dsdb/kcc/kcc_periodic.c +++ b/source4/dsdb/kcc/kcc_periodic.c @@ -42,8 +42,8 @@ */ static bool kccsrv_same_source_dsa(struct repsFromToBlob *r1, struct repsFromToBlob *r2) { - return GUID_compare(&r1->ctr.ctr1.source_dsa_obj_guid, - &r2->ctr.ctr1.source_dsa_obj_guid) == 0; + return GUID_equal(&r1->ctr.ctr1.source_dsa_obj_guid, + &r2->ctr.ctr1.source_dsa_obj_guid); } /* @@ -498,7 +498,7 @@ NTSTATUS kccsrv_simple_update(struct kccsrv_service *s, TALLOC_CTX *mem_ctx) struct GUID ntds_guid, invocation_id; ntds_guid = samdb_result_guid(res->msgs[i], "objectGUID"); - if (GUID_compare(&ntds_guid, &s->ntds_guid) == 0) { + if (GUID_equal(&ntds_guid, &s->ntds_guid)) { /* don't replicate with ourselves */ continue; } diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c index 905fe5f604f..3f2c8519dc7 100644 --- a/source4/dsdb/repl/drepl_notify.c +++ b/source4/dsdb/repl/drepl_notify.c @@ -255,14 +255,14 @@ static struct dreplsrv_partition_source_dsa *dreplsrv_find_notify_dsa(struct dre /* first check the sources list */ for (s=p->sources; s; s=s->next) { - if (GUID_compare(&s->repsFrom1->source_dsa_obj_guid, guid) == 0) { + if (GUID_equal(&s->repsFrom1->source_dsa_obj_guid, guid)) { return s; } } /* then the notifies list */ for (s=p->notifies; s; s=s->next) { - if (GUID_compare(&s->repsFrom1->source_dsa_obj_guid, guid) == 0) { + if (GUID_equal(&s->repsFrom1->source_dsa_obj_guid, guid)) { return s; } } diff --git a/source4/dsdb/repl/drepl_out_pull.c b/source4/dsdb/repl/drepl_out_pull.c index 58d877870eb..e64c91d29a0 100644 --- a/source4/dsdb/repl/drepl_out_pull.c +++ b/source4/dsdb/repl/drepl_out_pull.c @@ -57,8 +57,8 @@ void drepl_reps_update(struct dreplsrv_service *s, const char *reps_attr, } for (i=0; i<count; i++) { - if (GUID_compare(source_dsa_obj_guid, - &reps[i].ctr.ctr1.source_dsa_obj_guid) == 0) { + if (GUID_equal(source_dsa_obj_guid, + &reps[i].ctr.ctr1.source_dsa_obj_guid)) { break; } } diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c index 7be069e0dc5..8c85ef6f258 100644 --- a/source4/dsdb/repl/drepl_partitions.c +++ b/source4/dsdb/repl/drepl_partitions.c @@ -364,7 +364,7 @@ static struct dreplsrv_partition_source_dsa *dreplsrv_find_source_dsa(struct dre { struct dreplsrv_partition_source_dsa *s; for (s=list; s; s=s->next) { - if (GUID_compare(&s->repsFrom1->source_dsa_obj_guid, guid) == 0) { + if (GUID_equal(&s->repsFrom1->source_dsa_obj_guid, guid)) { return s; } } @@ -415,8 +415,8 @@ static WERROR dreplsrv_partition_add_source_dsa(struct dreplsrv_service *s, /* re-use an existing source if found */ for (s2=*listp; s2; s2=s2->next) { - if (GUID_compare(&s2->repsFrom1->source_dsa_obj_guid, - &source->repsFrom1->source_dsa_obj_guid) == 0) { + if (GUID_equal(&s2->repsFrom1->source_dsa_obj_guid, + &source->repsFrom1->source_dsa_obj_guid)) { talloc_free(s2->repsFrom1->other_info); *s2->repsFrom1 = *source->repsFrom1; talloc_steal(s2, s2->repsFrom1->other_info); diff --git a/source4/dsdb/samdb/ldb_modules/util.c b/source4/dsdb/samdb/ldb_modules/util.c index 147e3578471..a71c49b042c 100644 --- a/source4/dsdb/samdb/ldb_modules/util.c +++ b/source4/dsdb/samdb/ldb_modules/util.c @@ -742,7 +742,7 @@ int dsdb_check_optional_feature(struct ldb_module *module, struct GUID op_featur search_guid = samdb_result_guid(res->msgs[0], "msDS-OptionalFeatureGUID"); - if (GUID_compare(&search_guid, &op_feature_guid) == 0) { + if (GUID_equal(&search_guid, &op_feature_guid)) { *feature_enabled = true; break; } |