diff options
Diffstat (limited to 'source4/lib/ldb/common/ldb_utf8.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb_utf8.c | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c index 1b7319915b..743e976e84 100644 --- a/source4/lib/ldb/common/ldb_utf8.c +++ b/source4/lib/ldb/common/ldb_utf8.c @@ -42,10 +42,13 @@ */ void ldb_set_utf8_fns(struct ldb_context *ldb, void *context, + int (*cmp)(void *, const char *, const char *), char *(*casefold)(void *, void *, const char *)) { if (context) ldb->utf8_fns.context = context; + if (cmp) + ldb->utf8_fns.caseless_cmp = cmp; if (casefold) ldb->utf8_fns.casefold = casefold; } @@ -68,9 +71,19 @@ char *ldb_casefold_default(void *context, void *mem_ctx, const char *s) return ret; } +/* + a caseless compare, optimised for 7 bit + NOTE: doesn't handle UTF8 +*/ + +int ldb_caseless_cmp_default(void *context, const char *s1, const char *s2) +{ + return strcasecmp(s1,s2); +} + void ldb_set_utf8_default(struct ldb_context *ldb) { - ldb_set_utf8_fns(ldb, NULL, ldb_casefold_default); + ldb_set_utf8_fns(ldb, NULL, ldb_caseless_cmp_default, ldb_casefold_default); } char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s) @@ -78,6 +91,11 @@ char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s) return ldb->utf8_fns.casefold(ldb->utf8_fns.context, mem_ctx, s); } +int ldb_caseless_cmp(struct ldb_context *ldb, const char *s1, const char *s2) +{ + return ldb->utf8_fns.caseless_cmp(ldb->utf8_fns.context, s1, s2); +} + /* check the attribute name is valid according to rfc2251 returns 1 if the name is ok @@ -112,7 +130,8 @@ int ldb_valid_attr_name(const char *s) /* compare two attribute names - attribute names are restricted by rfc2251 so using strcasecmp here is ok. + attribute names are restricted by rfc2251 so using + strcasecmp and toupper here is ok. return 0 for match */ int ldb_attr_cmp(const char *attr1, const char *attr2) @@ -120,6 +139,20 @@ int ldb_attr_cmp(const char *attr1, const char *attr2) return strcasecmp(attr1, attr2); } +char *ldb_attr_casefold(void *mem_ctx, const char *s) +{ + int i; + char *ret = talloc_strdup(mem_ctx, s); + if (!s) { + errno = ENOMEM; + return NULL; + } + for (i = 0; ret[i]; i++) { + ret[i] = toupper((unsigned char)ret[i]); + } + return ret; +} + /* we accept either 'dn' or 'distinguishedName' for a distinguishedName */ |