The branch, master has been updated
via ab37552 s4-dsdb: Fix the case for attribute name msDS-hasMasterNCs
from 3272ba0 lib/tdb: remove unnecessary XOPEN and FILE_OFFSET_BITS
defines in test/
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ab375526e8ec8f34a79195a62adb33548599c87d
Author: Amitay Isaacs <ami...@gmail.com>
Date: Wed Mar 14 15:59:27 2012 +1100
s4-dsdb: Fix the case for attribute name msDS-hasMasterNCs
Autobuild-User: Amitay Isaacs <ami...@samba.org>
Autobuild-Date: Wed Mar 14 11:59:02 CET 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/kcc/kcc_drs_replica_info.c | 4 ++--
source4/dsdb/repl/drepl_partitions.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/kcc/kcc_drs_replica_info.c
b/source4/dsdb/kcc/kcc_drs_replica_info.c
index 8eb7266..8075242 100644
--- a/source4/dsdb/kcc/kcc_drs_replica_info.c
+++ b/source4/dsdb/kcc/kcc_drs_replica_info.c
@@ -386,7 +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 *post_2003_attrs[] = { "msDS-hasMasterNCs",
"hasPartialReplicaNCs", NULL };
const char *pre_2003_attrs[] = { "hasMasterNCs",
"hasPartialReplicaNCs", NULL };
const char **attrs = post_2003_attrs;
struct ldb_result *res;
@@ -397,7 +397,7 @@ static WERROR get_master_ncs(TALLOC_CTX *mem_ctx, struct
ldb_context *samdb,
char *nc_str;
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;
ret = ldb_search(samdb, mem_ctx, &res, ldb_get_config_basedn(samdb),
LDB_SCOPE_DEFAULT, post_2003_attrs, "(objectguid=%s)",
ntds_guid_str);
diff --git a/source4/dsdb/repl/drepl_partitions.c
b/source4/dsdb/repl/drepl_partitions.c
index 07f3339..3aa715a 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -41,7 +41,7 @@
WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
{
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;
int ret;
TALLOC_CTX *tmp_ctx;
--
Samba Shared Repository
