sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

s4-dsdb: Fix the case for attribute name msDS-hasMasterNCs

Browse Source 
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Mar 14 11:59:02 CET 2012 on sn-devel-104
This commit is contained in:
Amitay Isaacs 2012-03-14 15:59:27 +11:00 committed by Amitay Isaacs
parent 3272ba0d2d
commit ab375526e8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/dsdb/kcc/kcc_drs_replica_info.c
View File

@ -386,7 +386,7 @@ struct ncList {
static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct ldb_context *samdb, 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 *ntds_guid_str, struct ncList **master_nc_list)
{ {
const char *post_2003_attrs[] = { "msDs-hasMasterNCs", "hasPartialReplicaNCs", NULL }; const char *post_2003_attrs[] = { "msDS-hasMasterNCs", "hasPartialReplicaNCs", NULL };
const char *pre_2003_attrs[] = { "hasMasterNCs", "hasPartialReplicaNCs", NULL }; const char *pre_2003_attrs[] = { "hasMasterNCs", "hasPartialReplicaNCs", NULL };
const char **attrs = post_2003_attrs; const char **attrs = post_2003_attrs;
struct ldb_result *res; struct ldb_result *res;
@ -397,7 +397,7 @@ static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct ldb_context *samdb,
char *nc_str; char *nc_str;
int is_level_post_2003; int is_level_post_2003;
/* In W2003 and greater, msDs-hasMasterNCs attribute lists the writable NC replicas */ /* In W2003 and greater, msDS-hasMasterNCs attribute lists the writable NC replicas */
is_level_post_2003 = 1; is_level_post_2003 = 1;
ret = ldb_search(samdb, mem_ctx, &res, ldb_get_config_basedn(samdb), ret = ldb_search(samdb, mem_ctx, &res, ldb_get_config_basedn(samdb),
LDB_SCOPE_DEFAULT, post_2003_attrs, "(objectguid=%s)", ntds_guid_str); LDB_SCOPE_DEFAULT, post_2003_attrs, "(objectguid=%s)", ntds_guid_str);

2
source4/dsdb/repl/drepl_partitions.c
View File

@ -41,7 +41,7 @@
WERROR dreplsrv_load_partitions(struct dreplsrv_service *s) WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
{ {
WERROR status; WERROR status;
static const char *attrs[] = { "hasMasterNCs", "msDs-hasMasterNCs", "hasPartialReplicaNCs", "msDS-HasFullReplicaNCs", NULL }; static const char *attrs[] = { "hasMasterNCs", "msDS-hasMasterNCs", "hasPartialReplicaNCs", "msDS-HasFullReplicaNCs", NULL };
unsigned int a; unsigned int a;
int ret; int ret;
TALLOC_CTX *tmp_ctx; TALLOC_CTX *tmp_ctx;