Attachment 13878 Details for Bug 13129 – Backport regression fix for 4.7

[patch] Backport regression fix for 4.7

0001-s4-samba-Fix-default-to-be-running-samba-as-a-deamon.patch (text/plain), 1.20 KB, created by Garming Sam on 2017-12-19 22:53:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Garming Sam

Created: 2017-12-19 22:53:51 UTC

Size: 1.20 KB

patch

obsolete

>From 1dbf5d8d7e86029630e75b8cc131676c2042e596 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Tue, 19 Dec 2017 16:30:08 +1300
>Subject: [PATCH] s4:samba: Fix default to be running samba as a deamon
>
>Commit 8736013dc42c5755b75bbb2e843a290bcd545909 got the (confusing) sense of opt_fork
>wrong.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13129
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Garming Sam <garming@catalyst.net.nz>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Tue Dec 19 11:24:29 CET 2017 on sn-devel-144
>
>(cherry picked from commit 0806ff7dfd3f982226e4cd9b923a0e570b765f0c)
>---
> source4/smbd/server.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source4/smbd/server.c b/source4/smbd/server.c
>index 2349d5c..b57ee4c 100644
>--- a/source4/smbd/server.c
>+++ b/source4/smbd/server.c
>@@ -429,7 +429,7 @@ static int binary_smbd_main(const char *binary_name,
> 			"not allowed together with -D|--daemon\n\n");
> 		poptPrintUsage(pc, stderr, 0);
> 		return 1;
>-	} else if (!opt_interactive && !opt_fork) {
>+	} else if (!opt_interactive && opt_fork) {
> 		/* default is --daemon */
> 		opt_daemon = true;
> 	}
>-- 
>1.9.1
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 13129: 13816 | 13817 | 13821 | 13875 | 13878 | 13940