Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet

(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)

4 files changed, 43 insertions, 132 deletions

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 8aff1340a5..552d83f411 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -400,8 +400,8 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 
 	ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, out, &ext_res);
 	if (ret != LDB_SUCCESS) {
-		DEBUG(0,("Failed to apply records: %d: %s\n",
-			ret, ldb_strerror(ret)));
+		DEBUG(0,("Failed to apply records: %s: %s\n",
+			 ldb_errstring(ldb), ldb_strerror(ret)));
 		talloc_free(out);
 		return WERR_FOOBAR;
 	}
diff --git a/source4/dsdb/samdb/ldb_modules/ranged_results.c b/source4/dsdb/samdb/ldb_modules/ranged_results.c
index 345b8b8440..c527afc6db 100644
--- a/source4/dsdb/samdb/ldb_modules/ranged_results.c
+++ b/source4/dsdb/samdb/ldb_modules/ranged_results.c
@@ -153,8 +153,10 @@ static int rr_search(struct ldb_module *module, struct ldb_request *req)
 		if (strncasecmp(p, ";range=", strlen(";range=")) != 0) {
 			continue;
 		}
-		if (sscanf(p, ";range=%u-*", &start) == 1) {
-		} else if (sscanf(p, ";range=%u-%u", &start, &end) != 2) {
+		if (sscanf(p, ";range=%u-%u", &start, &end) == 2) {
+		} else if (sscanf(p, ";range=%u-*", &start) == 1) {
+			end = (unsigned int)-1;
+		} else {
 			ldb_asprintf_errstring(module->ldb, "range request error: range requst malformed");
 			return LDB_ERR_UNWILLING_TO_PERFORM;
 		}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 5a3cc4bef4..441dbc9598 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -240,12 +240,9 @@ static int replmd_prepare_originating(struct ldb_module *module, struct ldb_requ
 				      struct ldb_dn *dn, const char *fn_name,
 				      int (*fn)(struct ldb_module *,
 			 			struct ldb_request *,
-						const struct dsdb_schema *,
-						const struct dsdb_control_current_partition *))
+						const struct dsdb_schema *))
 {
 	const struct dsdb_schema *schema;
-	const struct ldb_control *partition_ctrl;
-	const struct dsdb_control_current_partition *partition;
  
 	/* do not manipulate our control entries */
 	if (ldb_dn_is_special(dn)) {
@@ -260,46 +257,16 @@ static int replmd_prepare_originating(struct ldb_module *module, struct ldb_requ
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
 
-	partition_ctrl = ldb_request_get_control(req, DSDB_CONTROL_CURRENT_PARTITION_OID);
-	if (!partition_ctrl) {
-		ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
-			      "%s: no current partition control found",
-			      fn_name);
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-
-	partition = talloc_get_type(partition_ctrl->data,
-				    struct dsdb_control_current_partition);
-	if (!partition) {
-		ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
-			      "%s: current partition control contains invalid data",
-			      fn_name);
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-
-	if (partition->version != DSDB_CONTROL_CURRENT_PARTITION_VERSION) {
-		ldb_debug_set(module->ldb, LDB_DEBUG_FATAL,
-			      "%s: current partition control contains invalid version [%u != %u]\n",
-			      fn_name, partition->version, DSDB_CONTROL_CURRENT_PARTITION_VERSION);
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
-
-	return fn(module, req, schema, partition);
+	return fn(module, req, schema);
 }
 
 static int replmd_add_originating(struct ldb_module *module,
 				  struct ldb_request *req,
-				  const struct dsdb_schema *schema,
-				  const struct dsdb_control_current_partition *partition)
+				  const struct dsdb_schema *schema)
 {
 	enum ndr_err_code ndr_err;
 	struct ldb_request *down_req;
 	struct ldb_message *msg;
-	uint32_t instance_type;
-	struct ldb_dn *new_dn;
-	const char *rdn_name;
-	const char *rdn_name_upper;
-	const struct ldb_val *rdn_value = NULL;
 	const struct dsdb_attribute *rdn_attr = NULL;
 	struct GUID guid;
 	struct ldb_val guid_value;
@@ -321,12 +288,6 @@ static int replmd_add_originating(struct ldb_module *module,
 		return LDB_ERR_UNWILLING_TO_PERFORM;
 	}
 
-	if (ldb_msg_find_element(req->op.add.message, "instanceType")) {
-		ldb_debug_set(module->ldb, LDB_DEBUG_ERROR,
-			      "replmd_add_originating: it's not allowed to add an object with instanceType\n");
-		return LDB_ERR_UNWILLING_TO_PERFORM;
-	}
-
 	/* Get a sequence number from the backend */
 	ret = ldb_sequence_number(module->ldb, LDB_SEQ_NEXT, &seq_num);
 	if (ret != LDB_SUCCESS) {
@@ -368,32 +329,9 @@ static int replmd_add_originating(struct ldb_module *module,
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	/*
-	 * get details of the rdn name
-	 */
-	rdn_name	= ldb_dn_get_rdn_name(msg->dn);
-	if (!rdn_name) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	rdn_attr	= dsdb_attribute_by_lDAPDisplayName(schema, rdn_name);
-	if (!rdn_attr) {
-		talloc_free(down_req);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	rdn_value	= ldb_dn_get_rdn_val(msg->dn);
-	if (!rdn_value) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-
 	/* 
 	 * remove autogenerated attributes
 	 */
-	ldb_msg_remove_attr(msg, rdn_name);
-	ldb_msg_remove_attr(msg, "name");
 	ldb_msg_remove_attr(msg, "whenCreated");
 	ldb_msg_remove_attr(msg, "whenChanged");
 	ldb_msg_remove_attr(msg, "uSNCreated");
@@ -401,69 +339,14 @@ static int replmd_add_originating(struct ldb_module *module,
 	ldb_msg_remove_attr(msg, "replPropertyMetaData");
 
 	/*
-	 * TODO: construct a new DN out of:
-	 *       - the parent DN
-	 *       - the upper case of rdn_attr->LDAPDisplayName
-	 *       - rdn_value
-	 */
-	new_dn = ldb_dn_copy(msg, msg->dn);
-	if (!new_dn) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	rdn_name_upper = strupper_talloc(msg, rdn_attr->lDAPDisplayName);
-	if (!rdn_name_upper) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ret = ldb_dn_set_component(new_dn, 0, rdn_name_upper, *rdn_value);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	msg->dn = new_dn;
-
-	/*
-	 * TODO: calculate correct instance type
-	 */
-	instance_type = INSTANCE_TYPE_WRITE;
-	if (ldb_dn_compare(partition->dn, msg->dn) == 0) {
-		instance_type |= INSTANCE_TYPE_IS_NC_HEAD;
-		if (ldb_dn_compare(msg->dn, samdb_base_dn(module->ldb)) != 0) {
-			instance_type |= INSTANCE_TYPE_NC_ABOVE;
-		}
-	}
-
-	/*
 	 * readd replicated attributes
 	 */
-	ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
-	ret = ldb_msg_add_value(msg, "name", rdn_value, NULL);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
 	ret = ldb_msg_add_string(msg, "whenCreated", time_str);
 	if (ret != LDB_SUCCESS) {
 		talloc_free(down_req);
 		ldb_oom(module->ldb);
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
-	ret = ldb_msg_add_fmt(msg, "instanceType", "%u", instance_type);
-	if (ret != LDB_SUCCESS) {
-		talloc_free(down_req);
-		ldb_oom(module->ldb);
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
 
 	/* build the replication meta_data */
 	ZERO_STRUCT(nmd);
@@ -508,6 +391,10 @@ static int replmd_add_originating(struct ldb_module *module,
 		m->originating_usn		= seq_num;
 		m->local_usn			= seq_num;
 		ni++;
+
+		if (ldb_attr_cmp(e->name, ldb_dn_get_rdn_name(msg->dn))) {
+			rdn_attr = sa;
+		}
 	}
 
 	/* fix meta data count */
@@ -598,8 +485,7 @@ static int replmd_add(struct ldb_module *module, struct ldb_request *req)
 
 static int replmd_modify_originating(struct ldb_module *module,
 				     struct ldb_request *req,
-				     const struct dsdb_schema *schema,
-				     const struct dsdb_control_current_partition *partition)
+				     const struct dsdb_schema *schema)
 {
 	struct ldb_request *down_req;
 	struct ldb_message *msg;
@@ -623,6 +509,18 @@ static int replmd_modify_originating(struct ldb_module *module,
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
+	/* TODO:
+	 * - get the whole old object
+	 * - if the old object doesn't exist report an error
+	 * - give an error when a readonly attribute should
+	 *   be modified
+	 * - merge the changed into the old object
+	 *   if the caller set values to the same value
+	 *   ignore the attribute, return success when no
+	 *   attribute was changed
+	 * - calculate the new replPropertyMetaData attribute
+	 */
+
 	if (add_time_element(msg, "whenChanged", t) != 0) {
 		talloc_free(down_req);
 		return LDB_ERR_OPERATIONS_ERROR;
@@ -637,6 +535,11 @@ static int replmd_modify_originating(struct ldb_module *module,
 		}
 	}
 
+	/* TODO:
+	 * - sort the attributes by attid with replmd_ldb_message_sort()
+	 * - replace the old object with the newly constructed one
+	 */
+
 	ldb_set_timeout_from_prev_req(module->ldb, req, down_req);
 
 	/* go on with the call chain */
@@ -806,10 +709,16 @@ static int replmd_replicated_apply_add(struct replmd_replicated_request *ar)
 	return ldb_next_request(ar->module, ar->sub.change_req);
 #else
 	ret = ldb_next_request(ar->module, ar->sub.change_req);
-	if (ret != LDB_SUCCESS) return replmd_replicated_request_error(ar, ret);
+	if (ret != LDB_SUCCESS) {
+		ldb_asprintf_errstring(ar->module->ldb, "Failed to add replicated object %s: %s", ldb_dn_get_linearized(ar->sub.change_req->op.add.message->dn), 
+				       ldb_errstring(ar->module->ldb));
+		return replmd_replicated_request_error(ar, ret);
+	}
 
-	ar->sub.change_ret = ldb_wait(ar->sub.search_req->handle, LDB_WAIT_ALL);
+	ar->sub.change_ret = ldb_wait(ar->sub.change_req->handle, LDB_WAIT_ALL);
 	if (ar->sub.change_ret != LDB_SUCCESS) {
+		ldb_asprintf_errstring(ar->module->ldb, "Failed while waiting on add replicated object %s: %s", ldb_dn_get_linearized(ar->sub.change_req->op.add.message->dn), 
+				       ldb_errstring(ar->module->ldb));
 		return replmd_replicated_request_error(ar, ar->sub.change_ret);
 	}
 
@@ -1053,7 +962,7 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 	ret = ldb_next_request(ar->module, ar->sub.change_req);
 	if (ret != LDB_SUCCESS) return replmd_replicated_request_error(ar, ret);
 
-	ar->sub.change_ret = ldb_wait(ar->sub.search_req->handle, LDB_WAIT_ALL);
+	ar->sub.change_ret = ldb_wait(ar->sub.change_req->handle, LDB_WAIT_ALL);
 	if (ar->sub.change_ret != LDB_SUCCESS) {
 		return replmd_replicated_request_error(ar, ar->sub.change_ret);
 	}
@@ -1137,7 +1046,7 @@ static int replmd_replicated_apply_search(struct replmd_replicated_request *ar)
 	if (ret != LDB_SUCCESS) return replmd_replicated_request_error(ar, ret);
 
 	ar->sub.search_ret = ldb_wait(ar->sub.search_req->handle, LDB_WAIT_ALL);
-	if (ar->sub.search_ret != LDB_SUCCESS) {
+	if (ar->sub.search_ret != LDB_SUCCESS && ar->sub.search_ret != LDB_ERR_NO_SUCH_OBJECT) {
 		return replmd_replicated_request_error(ar, ar->sub.search_ret);
 	}
 	if (ar->sub.search_msg) {
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 9bc51c676e..2c133b6424 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -939,7 +939,7 @@ static WERROR dsdb_syntax_DN_BINARY_drsuapi_to_ldb(const struct dsdb_schema *sch
 		}
 
 		ndr_err = ndr_pull_struct_blob_all(in->value_ctr.values[i].blob,
-						   out->values, NULL, &id3b,
+						   out->values, lp_iconv_convenience(global_loadparm), &id3b,
 						   (ndr_pull_flags_fn_t)ndr_pull_drsuapi_DsReplicaObjectIdentifier3Binary);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -997,7 +997,7 @@ static WERROR dsdb_syntax_DN_BINARY_ldb_to_drsuapi(const struct dsdb_schema *sch
 		id3b.dn		= (const char *)in->values[i].data;
 		id3b.binary	= data_blob(NULL, 0);
 
-		ndr_err = ndr_push_struct_blob(&blobs[i], blobs, NULL, &id3b,
+		ndr_err = ndr_push_struct_blob(&blobs[i], blobs, lp_iconv_convenience(global_loadparm), &id3b,
 					       (ndr_push_flags_fn_t)ndr_push_drsuapi_DsReplicaObjectIdentifier3Binary);
 		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 			NTSTATUS status = ndr_map_error2ntstatus(ndr_err);