summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-12-02 14:13:41 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-12-02 14:13:41 +1100
commit9b17e3b63419dba3ff8fac627d24366b6b6e12c4 (patch)
tree81c84ce54e8aec7ed281c27939908a871732cbdc /source4/utils
parent931f16f6229f16eac866934f65f567c200d4b111 (diff)
downloadsamba-9b17e3b63419dba3ff8fac627d24366b6b6e12c4.tar.gz
samba-9b17e3b63419dba3ff8fac627d24366b6b6e12c4.tar.bz2
samba-9b17e3b63419dba3ff8fac627d24366b6b6e12c4.zip
Use the direct pointer to the syntax
This rather than manually searching for it, and is inspired by a similar commit in dsdb/schema/schema_description.c by metze Andrew Bartlett
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/ad2oLschema.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/utils/ad2oLschema.c b/source4/utils/ad2oLschema.c
index e926dd1ccc..2e3139d9c7 100644
--- a/source4/utils/ad2oLschema.c
+++ b/source4/utils/ad2oLschema.c
@@ -226,7 +226,6 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch
const char *equality = NULL, *substring = NULL;
bool single_value = attribute->isSingleValued;
- const struct dsdb_syntax *map = find_syntax_map_by_ad_syntax(attribute->oMSyntax);
char *schema_entry = NULL;
int j;
@@ -244,11 +243,11 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch
}
}
- if (map) {
+ if (attribute->syntax) {
/* We might have been asked to remap this oid,
* due to a conflict, or lack of
* implementation */
- syntax = map->ldap_oid;
+ syntax = attribute->syntax->ldap_oid;
/* We might have been asked to remap this oid, due to a conflict */
for (j=0; syntax && oid_map && oid_map[j].old_oid; j++) {
if (strcasecmp(syntax, oid_map[j].old_oid) == 0) {
@@ -257,8 +256,8 @@ static struct schema_conv process_convert(struct ldb_context *ldb, enum dsdb_sch
}
}
- equality = map->equality;
- substring = map->substring;
+ equality = attribute->syntax->equality;
+ substring = attribute->syntax->substring;
}
/* We might have been asked to remap this name, due to a conflict */