merge from 2.2

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 4d4c612b521f5a92c7b2909b5b3df5720e2edd9c..7647f45beaf8c1c494515490e04d69d831c1982f 100644 (file)
--- a/source/smbd/server.c
+++ b/source/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;
        }