summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2017-12-19 16:30:08 +1300
committerKarolin Seeger <kseeger@samba.org>2017-12-21 00:55:29 +0100
commitedc0c992e0ddbd305e4a70939dac6a0691db5cf2 (patch)
treef868794c22c7c7ff5d53100e30c59db42b1beeb4 /source4/smbd
parent1eb08445d96a2c41593719925203f43f881b3567 (diff)
downloadsamba-edc0c992e0ddbd305e4a70939dac6a0691db5cf2.tar.gz
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) Autobuild-User(v4-7-test): Karolin Seeger <kseeger@samba.org> Autobuild-Date(v4-7-test): Thu Dec 21 00:55:29 CET 2017 on sn-devel-144
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 2349d5c7fa0..b57ee4c2c60 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;
}