From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 9 Sep 2009 15:27:12 +0000 (+1000)
Subject: s4/drs: when we don't find an attribute use zero values
X-Git-Tag: talloc-2.0.1~608
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=b65d6cf0135785aa10857c107c3a094ce170bbf7

s4/drs: when we don't find an attribute use zero values

thanks to metze for pointing this out
---

diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index 1455b6b0031..6e65e3185b2 100644
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -112,25 +112,16 @@ static WERROR get_nc_changes_build_object(struct drsuapi_DsReplicaObjectListItem
 		if (el == NULL) {
 			DEBUG(0,("No element '%s' for attributeID %u in message\n", 
 				 sa->lDAPDisplayName, md.ctr.ctr1.array[i].attid));
-			/* we really should find it, but let's try to
-			 * cope for now by going to the next one
-			 */
-			memmove(&obj->meta_data_ctr->meta_data[i], &obj->meta_data_ctr->meta_data[i+1],
-				sizeof(obj->meta_data_ctr->meta_data[i])*(obj->object.attribute_ctr.num_attributes-(i+1)));
-			memmove(&md.ctr.ctr1.array[i], &md.ctr.ctr1.array[i+1],
-				sizeof(md.ctr.ctr1.array[i])*(obj->object.attribute_ctr.num_attributes-(i+1)));
-			obj->object.attribute_ctr.num_attributes--;
-			i--;
-			obj->meta_data_ctr->count--;
-			continue;
-		}
-
-		werr = dsdb_attribute_ldb_to_drsuapi(sam_ctx, schema, el, obj,
-						     &obj->object.attribute_ctr.attributes[i]);
-		if (!W_ERROR_IS_OK(werr)) {
-			DEBUG(0,("Unable to convert %s to DRS object - %s\n", 
-				 sa->lDAPDisplayName, win_errstr(werr)));
-			return werr;
+			ZERO_STRUCT(obj->object.attribute_ctr.attributes[i]);
+			obj->object.attribute_ctr.attributes[i].attid = md.ctr.ctr1.array[i].attid;
+		} else {
+			werr = dsdb_attribute_ldb_to_drsuapi(sam_ctx, schema, el, obj,
+							     &obj->object.attribute_ctr.attributes[i]);
+			if (!W_ERROR_IS_OK(werr)) {
+				DEBUG(0,("Unable to convert %s to DRS object - %s\n", 
+					 sa->lDAPDisplayName, win_errstr(werr)));
+				return werr;
+			}
 		}
 	}