Attachment 10090 Details for Bug 9763 – Temporary patch for v4-1-test

[patch] Temporary patch for v4-1-test

tmp41.diff (text/plain), 1.59 KB, created by Stefan Metzmacher on 2014-07-08 17:25:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-07-08 17:25:16 UTC

Size: 1.59 KB

patch

obsolete

>From 49ba886490bc6aca8caf9a10823075df7e3ad8c9 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Mon, 7 Jul 2014 23:51:31 +0200
>Subject: [PATCH] CHPX s4:dsdb/repl_meta_data: make sure objectGUID can't be
> deleted
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=9763
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>---
> source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
>index 30b3012..4c5ced4 100644
>--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
>+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
>@@ -2474,7 +2474,7 @@ static int replmd_modify(struct ldb_module *module, struct ldb_request *req)
> 	int ret;
> 	bool is_urgent = false, rodc = false;
> 	unsigned int functional_level;
>-	const DATA_BLOB *guid_blob;
>+	const struct ldb_message_element *guid_el = NULL;
> 	struct ldb_control *sd_propagation_control;
> 	struct replmd_private *replmd_private =
> 		talloc_get_type(ldb_module_get_private(module), struct replmd_private);
>@@ -2503,8 +2503,8 @@ static int replmd_modify(struct ldb_module *module, struct ldb_request *req)
> 
> 	ldb_debug(ldb, LDB_DEBUG_TRACE, "replmd_modify\n");
> 
>-	guid_blob = ldb_msg_find_ldb_val(req->op.mod.message, "objectGUID");
>-	if ( guid_blob != NULL ) {
>+	guid_el = ldb_msg_find_element(req->op.mod.message, "objectGUID");
>+	if (guid_el != NULL) {
> 		ldb_set_errstring(ldb,
> 				  "replmd_modify: it's not allowed to change the objectGUID!");
> 		return LDB_ERR_CONSTRAINT_VIOLATION;
>-- 
>1.9.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 9763: 10090 | 10095