samba: add current RHEL6 patches

[ipfire-2.x.git] / src / patches / samba / samba-3.6.99-fix_mangling_hash_segfault.patch

diff --git a/src/patches/samba/samba-3.6.99-fix_mangling_hash_segfault.patch b/src/patches/samba/samba-3.6.99-fix_mangling_hash_segfault.patch
new file mode 100644 (file)
index 0000000..ce19a97
--- /dev/null
+++ b/src/patches/samba/samba-3.6.99-fix_mangling_hash_segfault.patch
@@ -0,0 +1,38 @@
+From 9f974a391260e95340f08091fdbc822845eae160 Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl@samba.org>
+Date: Tue, 19 Aug 2014 14:32:15 +0000
+Subject: [PATCH] PATCHSET29: 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
+
+(cherry picked from commit e914c2c52db7ecf3bb2a3860820c5cfe8812696e)
+---
+ source3/smbd/mangle_hash.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c
+index bafcd03..35a098f 100644
+--- a/source3/smbd/mangle_hash.c
++++ b/source3/smbd/mangle_hash.c
+@@ -706,6 +706,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);
+-- 
+2.5.0
+