From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 8 Jul 2016 08:15:29 +0000 (+0200)
Subject: s4:dsdb/repl_meta_data: sort preserved_attrs and add "msDS-PortLDAP"
X-Git-Tag: tdb-1.3.10~447
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5287e4046d93d935609d2354eea58280c13d1e99;p=thirdparty%2Fsamba.git

s4:dsdb/repl_meta_data: sort preserved_attrs and add "msDS-PortLDAP"

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 80808347e4f..1a9a400b40a 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -3084,17 +3084,52 @@ static int replmd_delete_internals(struct ldb_module *module, struct ldb_request
 	struct ldb_message_element *el;
 	TALLOC_CTX *tmp_ctx;
 	struct ldb_result *res, *parent_res;
-	const char *preserved_attrs[] = {
+	static const char * const preserved_attrs[] = {
 		/* yes, this really is a hard coded list. See MS-ADTS
 		   section 3.1.1.5.5.1.1 */
-		"nTSecurityDescriptor", "attributeID", "attributeSyntax", "dNReferenceUpdate", "dNSHostName",
-		"flatName", "governsID", "groupType", "instanceType", "lDAPDisplayName", "legacyExchangeDN",
-		"isDeleted", "isRecycled", "lastKnownParent", "msDS-LastKnownRDN", "mS-DS-CreatorSID",
-		"mSMQOwnerID", "nCName", "objectClass", "distinguishedName", "objectGUID", "objectSid",
-		"oMSyntax", "proxiedObjectName", "name", "replPropertyMetaData", "sAMAccountName",
-		"securityIdentifier", "sIDHistory", "subClassOf", "systemFlags", "trustPartner", "trustDirection",
-		"trustType", "trustAttributes", "userAccountControl", "uSNChanged", "uSNCreated", "whenCreated",
-		"whenChanged", NULL};
+		"attributeID",
+		"attributeSyntax",
+		"dNReferenceUpdate",
+		"dNSHostName",
+		"flatName",
+		"governsID",
+		"groupType",
+		"instanceType",
+		"lDAPDisplayName",
+		"legacyExchangeDN",
+		"isDeleted",
+		"isRecycled",
+		"lastKnownParent",
+		"msDS-LastKnownRDN",
+		"msDS-PortLDAP",
+		"mS-DS-CreatorSID",
+		"mSMQOwnerID",
+		"nCName",
+		"objectClass",
+		"distinguishedName",
+		"objectGUID",
+		"objectSid",
+		"oMSyntax",
+		"proxiedObjectName",
+		"name",
+		"nTSecurityDescriptor",
+		"replPropertyMetaData",
+		"sAMAccountName",
+		"securityIdentifier",
+		"sIDHistory",
+		"subClassOf",
+		"systemFlags",
+		"trustPartner",
+		"trustDirection",
+		"trustType",
+		"trustAttributes",
+		"userAccountControl",
+		"uSNChanged",
+		"uSNCreated",
+		"whenCreated",
+		"whenChanged",
+		NULL
+	};
 	unsigned int i, el_count = 0;
 	enum deletion_state deletion_state, next_deletion_state;