From: Kamen Mazdrashki <kamen.mazdrashki@postpath.com>
Date: Thu, 7 Jan 2010 03:08:49 +0000 (+0200)
Subject: Revert "s4-schema: Set ATTID in schema cache from "msDS-IntId""
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=25238110dfc0826c2e533a543d1ca44e1f9e058c;p=abartlet%2Fsamba.git%2F.git

Revert "s4-schema: Set ATTID in schema cache from "msDS-IntId""

This reverts commit 4e8ad284f5813413fdec8426f11e24570d22549b.
---

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 48da80c7f19..77e4d3590df 100644
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -558,19 +558,14 @@ WERROR dsdb_attribute_from_ldb(struct ldb_context *ldb,
 		/* set an invalid value */
 		attr->attributeID_id = 0xFFFFFFFF;
 	} else {
-		/* check if msDS-IntId element is set */
-		attr->attributeID_id = samdb_result_uint(msg, "msDS-IntId", 0xFFFFFFFF);
-		if (attr->attributeID_id == 0xFFFFFFFF) {
-			/* msDS-IntId is not set, make */
-			status = dsdb_schema_pfm_make_attid(schema->prefixmap,
-							    attr->attributeID_oid,
-							    &attr->attributeID_id);
-			if (!W_ERROR_IS_OK(status)) {
-				DEBUG(0,("%s: '%s': unable to map attributeID %s: %s\n",
-					__location__, attr->lDAPDisplayName, attr->attributeID_oid,
-					win_errstr(status)));
-				return status;
-			}
+		status = dsdb_schema_pfm_make_attid(schema->prefixmap,
+						    attr->attributeID_oid,
+						    &attr->attributeID_id);
+		if (!W_ERROR_IS_OK(status)) {
+			DEBUG(0,("%s: '%s': unable to map attributeID %s: %s\n",
+				__location__, attr->lDAPDisplayName, attr->attributeID_oid,
+				win_errstr(status)));
+			return status;
 		}
 	}
 	GET_GUID_LDB(msg, "schemaIDGUID", attr, schemaIDGUID);