diff options
| author | Kamen Mazdrashki <kamen.mazdrashki@postpath.com> | 2010-01-07 05:08:49 +0200 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-01-08 13:03:04 +1100 |
| commit | 25238110dfc0826c2e533a543d1ca44e1f9e058c (patch) | |
| tree | e8d36a6c202c27e85f370267538968470011f63c | |
| parent | 6247a135c68b592d99a8c1594aebe5ca7e716d7c (diff) | |
| download | samba-25238110dfc0826c2e533a543d1ca44e1f9e058c.tar.gz samba-25238110dfc0826c2e533a543d1ca44e1f9e058c.tar.bz2 samba-25238110dfc0826c2e533a543d1ca44e1f9e058c.zip | |
Revert "s4-schema: Set ATTID in schema cache from "msDS-IntId""
This reverts commit 4e8ad284f5813413fdec8426f11e24570d22549b.
| -rw-r--r-- | source4/dsdb/schema/schema_init.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c index 48da80c7f1..77e4d3590d 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); |