Attachment 9813 Details for Bug 10239 – fix for 4.1, cherry-picked from master

[patch] fix for 4.1, cherry-picked from master

fix-10239_v4-1.patch (text/plain), 1.24 KB, created by Björn Baumbach on 2014-03-27 10:48:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2014-03-27 10:48:13 UTC

Size: 1.24 KB

patch

obsolete

>From a8acfe99e792d783a00a45cb4339f2bb74833088 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Wed, 19 Mar 2014 15:01:11 +0100
>Subject: [PATCH] s3-nmbd: reset debug settings after reading config file (bug
> #10239)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Tue Mar 25 18:29:06 CET 2014 on sn-devel-104
>
>(cherry picked from commit a7df00c82049547129f063a40a842b156c8aead4)
>---
> source3/nmbd/nmbd.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
>index ec0e7d0..8084e58 100644
>--- a/source3/nmbd/nmbd.c
>+++ b/source3/nmbd/nmbd.c
>@@ -414,6 +414,8 @@ static bool reload_nmbd_services(bool test)
> 		reload_nmbd_services( True );
> 	}
> 
>+	reopen_logs();
>+
> 	return(ret);
> }
> 
>@@ -907,6 +909,8 @@ static bool open_sockets(bool isdaemon, int port)
> 		exit(1);
> 	}
> 
>+	reopen_logs();
>+
> 	if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC
> 	    && !lp_parm_bool(-1, "server role check", "inhibit", false)) {
> 		/* TODO: when we have a merged set of defaults for
>-- 
>1.8.3.2
>

Flags:

jra: review+
abartlet: review+

Actions: View

Attachments on bug 10239: 9812 | 9813