Merge branch 'master' of git://git.samba.org/samba

3 files changed, 6 insertions, 23 deletions

diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index e8652dcaf1..fe3b2d2497 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -404,7 +404,7 @@ WERROR dreplsrv_notify_schedule(struct dreplsrv_service *service, uint32_t next_
 	W_ERROR_HAVE_NO_MEMORY(new_te);
 
 	tmp_mem = talloc_new(service);
-	DEBUG(2,("dreplsrv_notify_schedule(%u) %sscheduled for: %s\n",
+	DEBUG(4,("dreplsrv_notify_schedule(%u) %sscheduled for: %s\n",
 		next_interval,
 		(service->notify.te?"re":""),
 		nt_time_string(tmp_mem, timeval_to_nttime(&next_time))));
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index 85412a793c..5b8227e7de 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -39,16 +39,15 @@ WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
 	struct ldb_dn *basedn;
 	struct ldb_result *r;
 	struct ldb_message_element *el;
-	static const char *attrs[] = { "namingContexts", NULL };
+	static const char *attrs[] = { "hasMasterNCs", NULL };
 	uint32_t i;
 	int ret;
 
-	basedn = ldb_dn_new(s, s->samdb, NULL);
+	basedn = samdb_ntds_settings_dn(s->samdb);
 	W_ERROR_HAVE_NO_MEMORY(basedn);
 
 	ret = ldb_search(s->samdb, s, &r, basedn, LDB_SCOPE_BASE, attrs,
 			 "(objectClass=*)");
-	talloc_free(basedn);
 	if (ret != LDB_SUCCESS) {
 		return WERR_FOOBAR;
 	} else if (r->count != 1) {
@@ -56,7 +55,7 @@ WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
 		return WERR_FOOBAR;
 	}
 
-	el = ldb_msg_find_element(r->msgs[0], "namingContexts");
+	el = ldb_msg_find_element(r->msgs[0], "hasMasterNCs");
 	if (!el) {
 		return WERR_FOOBAR;
 	}
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 1efbd29d93..c72b107b75 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -128,15 +128,6 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
 		}
 
 		status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, a, msg->elements, e);
-		if (!NT_STATUS_IS_OK(status) && a->value_ctr.num_values == 0) {
-			/* w2k8-r2 occasionally sends bogus empty
-			   attributes with rubbish attribute IDs. The
-			   only think we can do is discard these */
-			DEBUG(0,(__location__ ": Discarding bogus empty DsReplicaAttribute with attid 0x%x\n",
-				 a->attid));
-			ZERO_STRUCTP(e);
-			continue;
-		}
 		W_ERROR_NOT_OK_RETURN(status);
 
 		m->attid			= a->attid;
@@ -157,14 +148,6 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
 		}
 	}
 
-	/* delete any empty elements */
-	for (i=0; i < msg->num_elements; i++) {
-		if (msg->elements[i].name == NULL) {
-			ldb_msg_remove_element(msg, &msg->elements[i]);
-			i--;
-		}
-	}
-
 	if (rdn_m) {
 		struct ldb_message_element *el;
 		el = ldb_msg_find_element(msg, rdn_attr->lDAPDisplayName);
@@ -319,7 +302,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 
 	ret = ldb_transaction_prepare_commit(ldb);
 	if (ret != LDB_SUCCESS) {
-		DEBUG(0,(__location__ " Failed to prepare commit of transaction\n"));
+		DEBUG(0,(__location__ " Failed to prepare commit of transaction: %s\n",
+			 ldb_errstring(ldb)));
 		return WERR_FOOBAR;
 	}