From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 15 May 2016 09:31:27 +0000 (+1200)
Subject: dsdb: Remove incorrect RDN attid check in replmd_replPropertyMetaDataCtr1_verify
X-Git-Tag: tdb-1.3.10~994
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21b4f67acd51af3ab1da069933a64c328ab57998;p=thirdparty%2Fsamba.git

dsdb: Remove incorrect RDN attid check in replmd_replPropertyMetaDataCtr1_verify

On windows, the RDN is not sorted last.  Additionally, the check should have been
against dsdb_attribute_get_attid(), not just ->attributeID_id

By including this in earlier versions of Samba, we allow a backport of Samba
databases from Samba 4.5, where this will be sorted in the same way
as Windows 2012R2.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11842
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index abfe2c8f0fd..2bb96fd335d 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -713,12 +713,6 @@ static int replmd_replPropertyMetaDataCtr1_verify(struct ldb_context *ldb,
 			      ldb_dn_get_linearized(dn));
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
-	if (ctr1->array[ctr1->count - 1].attid != rdn_sa->attributeID_id) {
-		ldb_debug_set(ldb, LDB_DEBUG_FATAL,
-			      "No rDN found in replPropertyMetaData for %s!\n",
-			      ldb_dn_get_linearized(dn));
-		return LDB_ERR_CONSTRAINT_VIOLATION;
-	}
 
 	/* the objectClass attribute is value 0x00000000, so must be first */
 	if (ctr1->array[0].attid != DRSUAPI_ATTID_objectClass) {