]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
dsdb: Remove incorrect RDN attid check in replmd_replPropertyMetaDataCtr1_verify
authorAndrew Bartlett <abartlet@samba.org>
Sun, 15 May 2016 09:31:27 +0000 (21:31 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 6 Jun 2016 06:50:08 +0000 (08:50 +0200)
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

source4/dsdb/samdb/ldb_modules/repl_meta_data.c

index abfe2c8f0fd0e7fb224b3c7d3a179aba4ff74d82..2bb96fd335de939420b0c192389d0a816919ad49 100644 (file)
@@ -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) {