diff options
| author | Gerald Carter <jerry@samba.org> | 2003-01-14 15:52:45 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-01-14 15:52:45 +0000 |
| commit | 05edd278c238e81d9487faabdd1194aaf10bc3dd (patch) | |
| tree | cb17a3210d62373b351549daf134eb2cd8d24a17 | |
| parent | 5c076b62d789b7682be7b04b6f4593bcaa9fe77a (diff) | |
| download | samba-05edd278c238e81d9487faabdd1194aaf10bc3dd.tar.gz samba-05edd278c238e81d9487faabdd1194aaf10bc3dd.tar.bz2 samba-05edd278c238e81d9487faabdd1194aaf10bc3dd.zip | |
make -i flag work lik eit did in 2.2
(This used to be commit 54b054c1edd44096c7158993a886f915d7a07493)
| -rw-r--r-- | source3/smbd/server.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index e8d92bf064..194f9f2300 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 ... */ @@ -809,7 +812,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); /* |