From 90a241264290cf9976e2bd144c0f57a26a01fbda Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Tue, 14 Jan 2003 15:52:14 +0000 Subject: make -i flag work lik eit did in 2.2 (This used to be commit 5d821c0e23f96f4da6a29a6bebf800532fcf1aa6) --- source3/smbd/server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 0b2fa2a1ba..1d1061f6d8 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -145,7 +145,7 @@ static void msg_exit_server(int msg_type, pid_t src, void *buf, size_t len) Open the socket communication. ****************************************************************************/ -static BOOL open_sockets_smbd(BOOL is_daemon,const char *smb_ports) +static BOOL open_sockets_smbd(BOOL is_daemon, BOOL interactive, const char *smb_ports) { int num_interfaces = iface_count(); int num_sockets = 0; @@ -343,6 +343,9 @@ static BOOL open_sockets_smbd(BOOL is_daemon,const char *smb_ports) strerror(errno))); continue; } + + if (smbd_server_fd() != -1 && interactive) + return True; if (smbd_server_fd() != -1 && sys_fork()==0) { /* Child code ... */ @@ -805,7 +808,7 @@ static BOOL init_structs(void ) start_background_queue(); */ - if (!open_sockets_smbd(is_daemon,ports)) + if (!open_sockets_smbd(is_daemon, interactive, ports)) exit(1); /* -- cgit