diff options
| author | Gerald Carter <jerry@samba.org> | 2002-01-30 05:45:09 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-01-30 05:45:09 +0000 |
| commit | 69a9c005c21833bdf22b72aaa3704bd14f627840 (patch) | |
| tree | e01846b30c7039cb7f7c756510565e23b406f835 /source | |
| parent | 539b025397e569796f2349d33438c2be469c8c69 (diff) | |
| download | samba-69a9c005c21833bdf22b72aaa3704bd14f627840.tar.gz samba-69a9c005c21833bdf22b72aaa3704bd14f627840.tar.xz samba-69a9c005c21833bdf22b72aaa3704bd14f627840.zip | |
merge from 2.2
Diffstat (limited to 'source')
| -rw-r--r-- | source/smbd/server.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/smbd/server.c b/source/smbd/server.c index 4d4c612b521..7647f45beaf 100644 --- 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; } |