summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-08-21 12:56:04 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-08-21 12:56:04 +1000
commit473540d4a5550ff857a0710f077193869ed873f8 (patch)
tree5a41b89dc40c583af591e9bd97f91f529e464671
parent0d89adcd4bd2de35cbd4b6d5dc0675a4631c6132 (diff)
downloadsamba-473540d4a5550ff857a0710f077193869ed873f8.tar.gz
samba-473540d4a5550ff857a0710f077193869ed873f8.tar.bz2
samba-473540d4a5550ff857a0710f077193869ed873f8.zip
Don't hardcode attributes to be treated as a DN
This is now handled by reading the schema into the attributes. Also, when we do set something here, mark it as FIXED, so the schema and any reload from @ATTRIBUTES won't touch it. Andrew Bartlett (This used to be commit 7b24701335398ece3d1b3a20cf5f1174500b16ce)
-rw-r--r--source4/lib/ldb-samba/ldif_handlers.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/source4/lib/ldb-samba/ldif_handlers.c b/source4/lib/ldb-samba/ldif_handlers.c
index 22a57da10b..7301193dc2 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -617,19 +617,6 @@ static const struct {
{ "fRSReplicaSetGUID", LDB_SYNTAX_SAMBA_GUID },
{ "netbootGUID", LDB_SYNTAX_SAMBA_GUID },
{ "objectCategory", LDB_SYNTAX_SAMBA_OBJECT_CATEGORY },
- { "member", LDB_SYNTAX_DN },
- { "memberOf", LDB_SYNTAX_DN },
- { "nCName", LDB_SYNTAX_DN },
- { "schemaNamingContext", LDB_SYNTAX_DN },
- { "configurationNamingContext", LDB_SYNTAX_DN },
- { "rootDomainNamingContext", LDB_SYNTAX_DN },
- { "defaultNamingContext", LDB_SYNTAX_DN },
- { "subRefs", LDB_SYNTAX_DN },
- { "dMDLocation", LDB_SYNTAX_DN },
- { "serverReference", LDB_SYNTAX_DN },
- { "masteredBy", LDB_SYNTAX_DN },
- { "msDs-masteredBy", LDB_SYNTAX_DN },
- { "fSMORoleOwner", LDB_SYNTAX_DN },
{ "prefixMap", LDB_SYNTAX_SAMBA_PREFIX_MAP }
};
@@ -669,7 +656,7 @@ int ldb_register_samba_handlers(struct ldb_context *ldb)
return -1;
}
- ret = ldb_schema_attribute_add_with_syntax(ldb, samba_attributes[i].name, 0, s);
+ ret = ldb_schema_attribute_add_with_syntax(ldb, samba_attributes[i].name, LDB_ATTR_FLAG_FIXED, s);
if (ret != LDB_SUCCESS) {
return ret;
}