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/util | |
| 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/util')
| -rw-r--r-- | source4/lib/util/data_blob.c | 2 | ||||
| -rw-r--r-- | source4/lib/util/util_ldb.c | 4 | ||||
| -rw-r--r-- | source4/lib/util/util_ldb.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/util/data_blob.c b/source4/lib/util/data_blob.c index b258e47bba..57b34b7ae7 100644 --- a/source4/lib/util/data_blob.c +++ b/source4/lib/util/data_blob.c @@ -176,7 +176,7 @@ _PUBLIC_ DATA_BLOB data_blob_string_const(const char *str) { DATA_BLOB blob; blob.data = discard_const_p(uint8_t, str); - blob.length = strlen(str); + blob.length = str ? strlen(str) : 0; return blob; } diff --git a/source4/lib/util/util_ldb.c b/source4/lib/util/util_ldb.c index 0a7433696e..fab729c036 100644 --- a/source4/lib/util/util_ldb.c +++ b/source4/lib/util/util_ldb.c @@ -125,9 +125,9 @@ int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string) return ret; } -char *wrap_casefold(void *context, void *mem_ctx, const char *s) +char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n) { - return strupper_talloc(mem_ctx, s); + return strupper_talloc_n(mem_ctx, s, n); } diff --git a/source4/lib/util/util_ldb.h b/source4/lib/util/util_ldb.h index 030ba7ebee..43f98ae1a9 100644 --- a/source4/lib/util/util_ldb.h +++ b/source4/lib/util/util_ldb.h @@ -22,6 +22,6 @@ int gendb_search_dn(struct ldb_context *ldb, struct ldb_message ***res, const char * const *attrs); int gendb_add_ldif(struct ldb_context *ldb, const char *ldif_string); -char *wrap_casefold(void *context, void *mem_ctx, const char *s); +char *wrap_casefold(void *context, void *mem_ctx, const char *s, size_t n); #endif /* __LIB_UTIL_UTIL_LDB_H__ */ |