rpc_server/drsuapi: Set msDS_IntId as attid for linked attributes if exists

We got WERR_DS_DRA_SCHEMA_MISMATCH for linked attributes with 8418 error for
extended attributes when using same attid as attribute object.

Signed-off-by: Evgeny Sinelnikov <sin@altlinux.ru>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index cdcc8e1feac3427a2d7e193a03a05d5fe8202bcf..397e53c1f08464329bb27ab6fe57592d80c05368 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -286,4 +286,3 @@
 ^samba4.krb5.kdc.*as-req-aes.*fl2000dc
 # nt4_member and ad_member don't support ntlmv1
 ^samba3.blackbox.smbclient_auth.plain.*_member.*option=clientntlmv2auth=no.member.creds.*as.user
-^samba4.drs.rpc.msDSIntId.*msDSIntId.Schema

diff --git a/source4/rpc_server/drsuapi/getncchanges.c b/source4/rpc_server/drsuapi/getncchanges.c
index a992c09825026608ce736b5fbc78a41dc19b1932..2568f0efa9e83cb9fbdff773e28e11500cef7da8 100644 (file)
--- a/source4/rpc_server/drsuapi/getncchanges.c
+++ b/source4/rpc_server/drsuapi/getncchanges.c
@@ -482,7 +482,7 @@ static WERROR get_nc_changes_add_la(TALLOC_CTX *mem_ctx,
                        return WERR_OK;
                }
        }
-       la->attid = sa->attributeID_id;
+       la->attid = dsdb_attribute_get_attid(sa, false);
        la->flags = active?DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE:0;
 
        status = dsdb_get_extended_dn_uint32(dsdb_dn->dn, &la->meta_data.version, "RMD_VERSION");