[SCM] Samba Shared Repository - branch v4-7-test updated

[Karolin Seeger]

The branch, v4-7-test has been updated
       via  edc0c99 s4:samba: Fix default to be running samba as a deamon
      from  1eb0844 messaging: Always register the unique id

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-7-test


- Log -----------------------------------------------------------------
commit edc0c992e0ddbd305e4a70939dac6a0691db5cf2
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Dec 19 16:30:08 2017 +1300

    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 at samba.org>
    Reviewed-by: Garming Sam <garming at catalyst.net.nz>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at 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 at samba.org>
    Autobuild-Date(v4-7-test): Thu Dec 21 00:55:29 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source4/smbd/server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

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;
 	}


-- 
Samba Shared Repository