From c3b9cc08e878cf06ba1bb916ef243c0edd6a15d6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 30 Jan 2002 05:45:09 +0000 Subject: merge from 2.2 (This used to be commit 69a9c005c21833bdf22b72aaa3704bd14f627840) --- source3/smbd/server.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/smbd') 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; } -- cgit