summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-08-19 14:32:15 +0000
committerJeremy Allison <jra@samba.org>2014-08-26 01:30:38 +0200
commite914c2c52db7ecf3bb2a3860820c5cfe8812696e (patch)
tree99d61437cab36ba697f05da6207330462e0e2251
parent7f44432fb0b17c1c7cdda3d56c2cc132d25d9397 (diff)
downloadsamba-e914c2c52db7ecf3bb2a3860820c5cfe8812696e.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
-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 994f79f63e7..5daac629f39 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);