Attachment 10224 Details for Bug 10782 – git-am fix for master.

git-am fix for master.

look (text/plain), 1002 bytes, created by Jeremy Allison on 2014-08-25 19:20:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2014-08-25 19:20:41 UTC

Size: 1002 bytes

patch

obsolete

>From 153e8693b85523e67409896a9bfd150f68ec557c Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Tue, 19 Aug 2014 14:32:15 +0000
>Subject: [PATCH] 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>
>
>---
> 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 8a44ea2..f3d8522 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);
>-- 
>1.8.1.2
>

Flags:

vl: review+

Actions: View

Attachments on bug 10782: 10223 | 10224 | 10225 | 10232