From 523fb6d72b08a77e9c423a4f2d15d699d576d701 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 22 Sep 2009 20:56:32 -0700
Subject: s4-drs: ignore zero value elements in DRS add operations

w2k8 sometimes sends us a new object via DRS with an attribute with no
values
---
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'source4/dsdb/samdb')

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 39102e5bbe..bb1c5bb1a1 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1135,6 +1135,19 @@ static int replmd_replicated_apply_add(struct replmd_replicated_request *ar)
 		return replmd_replicated_request_error(ar, ret);
 	}
 
+	/* remove any message elements that have zero values */
+	for (i=0; i<msg->num_elements; i++) {
+		if (msg->elements[i].num_values == 0) {
+			DEBUG(4,(__location__ ": Removing attribute %s with num_values==0\n",
+				 msg->elements[i].name));
+			memmove(&msg->elements[i], 
+				&msg->elements[i+1], 
+				sizeof(msg->elements[i])*(msg->num_elements - (i+1)));
+			msg->num_elements--;
+			i--;
+		}
+	}
+	
 	/*
 	 * the meta data array is already sorted by the caller
 	 */
-- 
cgit