diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c b/source4/dsdb/kcc/kcc_drs_replica_info.c index 59759267e01..e52388e8557 100644 --- a/source4/dsdb/kcc/kcc_drs_replica_info.c +++ b/source4/dsdb/kcc/kcc_drs_replica_info.c @@ -386,9 +386,7 @@ struct ncList { static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct ldb_context *samdb, const char *ntds_guid_str, struct ncList **master_nc_list) { - const char *post_2003_attrs[] = { "msDS-hasMasterNCs", "hasPartialReplicaNCs", NULL }; - const char *pre_2003_attrs[] = { "hasMasterNCs", "hasPartialReplicaNCs", NULL }; - const char **attrs = post_2003_attrs; + const char *attrs[] = { "msDS-hasMasterNCs", "hasPartialReplicaNCs", NULL }; struct ldb_result *res; struct ncList *nc_list = NULL; struct ncList *nc_list_elem; @@ -398,15 +396,7 @@ static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct ldb_context *samdb, /* In W2003 and greater, msDS-hasMasterNCs attribute lists the writable NC replicas */ ret = ldb_search(samdb, mem_ctx, &res, ldb_get_config_basedn(samdb), - LDB_SCOPE_DEFAULT, post_2003_attrs, "(objectguid=%s)", ntds_guid_str); - - if (ret != LDB_SUCCESS) { - DEBUG(0,(__location__ ": Failed objectguid search - %s\n", ldb_errstring(samdb))); - - attrs = post_2003_attrs; - ret = ldb_search(samdb, mem_ctx, &res, ldb_get_config_basedn(samdb), - LDB_SCOPE_DEFAULT, pre_2003_attrs, "(objectguid=%s)", ntds_guid_str); - } + LDB_SCOPE_DEFAULT, attrs, "(objectguid=%s)", ntds_guid_str); if (ret != LDB_SUCCESS) { DEBUG(0,(__location__ ": Failed objectguid search - %s\n", ldb_errstring(samdb)));