diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-10-03 16:36:04 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-06 14:16:30 -0700 |
| commit | 7d9f18609b25463d306c0c150fe0da7f065860fd (patch) | |
| tree | b39273798896e63390d387a9247c087545535019 /source4/utils | |
| parent | c412a930ad19da866503e6d8ccb71fb3191fc6d2 (diff) | |
| download | samba-7d9f18609b25463d306c0c150fe0da7f065860fd.tar.gz samba-7d9f18609b25463d306c0c150fe0da7f065860fd.tar.bz2 samba-7d9f18609b25463d306c0c150fe0da7f065860fd.zip | |
Remove DESCRIPTION from generated schema lines.
This is not permitted in the AD aggregate schema, and more trouble
than it is worth in the OpenLDAP schema due to escaping issues.
Andrew Bartlett
Diffstat (limited to 'source4/utils')
| -rw-r--r-- | source4/utils/ad2oLschema.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source4/utils/ad2oLschema.c b/source4/utils/ad2oLschema.c index 3c2ffe7a00..c579112b45 100644 --- a/source4/utils/ad2oLschema.c +++ b/source4/utils/ad2oLschema.c @@ -221,7 +221,6 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch for (attribute=schema->attributes; attribute; attribute = attribute->next) { const char *name = attribute->lDAPDisplayName; - const char *description = attribute->adminDescription; const char *oid = attribute->attributeID_oid; const char *syntax = attribute->attributeSyntax_oid; const char *equality = NULL, *substring = NULL; @@ -270,7 +269,16 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch } } - schema_entry = schema_attribute_description(mem_ctx, target, seperator, oid, name, description, equality, substring, syntax, single_value, false); + schema_entry = schema_attribute_description(mem_ctx, + target, + seperator, + oid, + name, + equality, + substring, + syntax, + single_value, + false); if (schema_entry == NULL) { ret.failures++; @@ -291,7 +299,6 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch /* This is already sorted to have 'top' and similar classes first */ for (objectclass=schema->classes; objectclass; objectclass = objectclass->next) { const char *name = objectclass->lDAPDisplayName; - const char *description = objectclass->adminDescription; const char *oid = objectclass->governsID_oid; const char *subClassOf = objectclass->subClassOf; int objectClassCategory = objectclass->objectClassCategory; @@ -356,7 +363,6 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch oid, name, NULL, - description, subClassOf, objectClassCategory, must, |