summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-01-30 05:45:09 +0000
committerGerald Carter <jerry@samba.org>2002-01-30 05:45:09 +0000
commitc3b9cc08e878cf06ba1bb916ef243c0edd6a15d6 (patch)
treebb590ffb4e874af4d746a5d8a95151ccc58b7b6a /source3
parent967af63a5f05fcdaebb60dce5984bed9ff0e5ce6 (diff)
downloadsamba-c3b9cc08e878cf06ba1bb916ef243c0edd6a15d6.tar.gz
samba-c3b9cc08e878cf06ba1bb916ef243c0edd6a15d6.tar.bz2
samba-c3b9cc08e878cf06ba1bb916ef243c0edd6a15d6.zip
merge from 2.2
(This used to be commit 69a9c005c21833bdf22b72aaa3704bd14f627840)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/server.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 4d4c612b52..7647f45bea 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -781,7 +781,14 @@ static void usage(char *pname)
DEBUG(3,( "loaded services\n"));
if (!is_daemon && !is_a_socket(0)) {
- DEBUG(0,("standard input is not a socket, assuming -D option\n"));
+ if (!interactive)
+ DEBUG(0,("standard input is not a socket, assuming -D option\n"));
+
+ /*
+ * Setting is_daemon here prevents us from eventually calling
+ * the open_sockets_inetd()
+ */
+
is_daemon = True;
}