diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-22 17:37:43 +1000 |
| commit | 0a27ff953e17670aecc7aedb56c0f872cc4bb75d (patch) | |
| tree | 18ed167d94e1a50acf04bc22fc6d8f01bf7f1a5f /source4/lib/ldb/common/ldb_utf8.c | |
| parent | 8acc7f7da7718c7750387c1043391618be46e15b (diff) | |
| parent | cc43037f19056ed24d7fffa54456d597c63ad105 (diff) | |
| download | samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.gz samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.tar.bz2 samba-0a27ff953e17670aecc7aedb56c0f872cc4bb75d.zip | |
Merge branch 'abartlet-4-0-local' into v4-0-test
(This used to be commit 469fac2669991b130dec219e1a109a8b2ce224be)
Diffstat (limited to 'source4/lib/ldb/common/ldb_utf8.c')
| -rw-r--r-- | source4/lib/ldb/common/ldb_utf8.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/common/ldb_utf8.c b/source4/lib/ldb/common/ldb_utf8.c index b7b4a60122..69ee2b6964 100644 --- a/source4/lib/ldb/common/ldb_utf8.c +++ b/source4/lib/ldb/common/ldb_utf8.c @@ -40,8 +40,8 @@ function to handle utf8 caseless comparisons */ void ldb_set_utf8_fns(struct ldb_context *ldb, - void *context, - char *(*casefold)(void *, void *, const char *)) + void *context, + char *(*casefold)(void *, void *, const char *, size_t)) { if (context) ldb->utf8_fns.context = context; @@ -53,10 +53,10 @@ void ldb_set_utf8_fns(struct ldb_context *ldb, a simple case folding function NOTE: does not handle UTF8 */ -char *ldb_casefold_default(void *context, void *mem_ctx, const char *s) +char *ldb_casefold_default(void *context, void *mem_ctx, const char *s, size_t n) { int i; - char *ret = talloc_strdup(mem_ctx, s); + char *ret = talloc_strndup(mem_ctx, s, n); if (!s) { errno = ENOMEM; return NULL; @@ -72,9 +72,9 @@ void ldb_set_utf8_default(struct ldb_context *ldb) ldb_set_utf8_fns(ldb, NULL, ldb_casefold_default); } -char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s) +char *ldb_casefold(struct ldb_context *ldb, void *mem_ctx, const char *s, size_t n) { - return ldb->utf8_fns.casefold(ldb->utf8_fns.context, mem_ctx, s); + return ldb->utf8_fns.casefold(ldb->utf8_fns.context, mem_ctx, s, n); } /* |