summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-08-19 14:32:15 +0000
committerKarolin Seeger <kseeger@samba.org>2014-09-01 21:34:12 +0200
commita5f0ec0a6bbc747b5d368c98d2692c6c579c7b15 (patch)
treef0090b597dbd07e70fc9a3470ea62321e153ca92 /source3
parent708986f68b497ad8aa2bf2c84337a1d4c75a1e2d (diff)
downloadsamba-a5f0ec0a6bbc747b5d368c98d2692c6c579c7b15.tar.gz
smbd: Properly initialize mangle_hash
[Bug 10782] mangle_hash() can fail to initialize charset (smbd crash). https://bugzilla.samba.org/show_bug.cgi?id=10782 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org> Autobuild-User(master): Jeremy Allison <jra@samba.org> Autobuild-Date(master): Tue Aug 26 01:30:38 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/mangle_hash.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
index 8a44ea2d6a..f3d8522333 100644
--- a/source3/smbd/mangle_hash.c
+++ b/source3/smbd/mangle_hash.c
@@ -767,6 +767,10 @@ const struct mangle_fns *mangle_hash_init(void)
{
mangle_reset();
+ if (chartest == NULL) {
+ init_chartest();
+ }
+
/* Create the in-memory tdb using our custom hash function. */
tdb_mangled_cache = tdb_open_ex("mangled_cache", 1031, TDB_INTERNAL,
(O_RDWR|O_CREAT), 0644, NULL, fast_string_hash);