s3: Remove --log-stdout from daemons

The common cmdline parser provides --debug-stdout.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml
index 4ece42f3ca6bb4462ae3841fe54703bebb4deded..2eea65bfe6ab1d10b12b0ed727829bda1094d968 100644 (file)
--- a/docs-xml/manpages/nmbd.8.xml
+++ b/docs-xml/manpages/nmbd.8.xml
@@ -22,7 +22,6 @@
                <command>nmbd</command>
                <arg choice="opt">-D|--daemon</arg>
                <arg choice="opt">-F|--foreground</arg>
-               <arg choice="opt">-S|--log-stdout</arg>
                <arg choice="opt">-i|--interactive</arg>
                <arg choice="opt">-V</arg>
                <arg choice="opt">-d &lt;debug level&gt;</arg>
@@ -105,13 +104,6 @@
                </para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-S|--log-stdout</term>
-               <listitem><para>If specified, this parameter causes
-               <command>nmbd</command> to log to standard output rather
-               than a file.</para></listitem>
-               </varlistentry>
-
                <varlistentry>
                <term>-i|--interactive</term>
                <listitem><para>If this parameter is specified it causes the

diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml
index 73d808c70b735eeb08ca497027d5fb601d90aaf7..5d22bfc599f68afc575cf2ae824640a675c2298e 100644 (file)
--- a/docs-xml/manpages/smbd.8.xml
+++ b/docs-xml/manpages/smbd.8.xml
@@ -21,7 +21,6 @@
                <command>smbd</command>
                <arg choice="opt">-D|--daemon</arg>
                <arg choice="opt">-F|--foreground</arg>
-               <arg choice="opt">-S|--log-stdout</arg>
                <arg choice="opt">-i|--interactive</arg>
                <arg choice="opt">-V</arg>
                <arg choice="opt">-b|--build-options</arg>
@@ -114,13 +113,6 @@
                </para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-S|--log-stdout</term>
-               <listitem><para>If specified, this parameter causes
-               <command>smbd</command> to log to standard output rather
-               than a file.</para></listitem>
-               </varlistentry>
-
                <varlistentry>
                <term>-i|--interactive</term>
                <listitem><para>If this parameter is specified it causes the

diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml
index d5acc072a00b5940b344c61eea9223fe6bfc1e64..2c457a46d90bc9a78d0a4b7cb1b646180d8df23a 100644 (file)
--- a/docs-xml/manpages/winbindd.8.xml
+++ b/docs-xml/manpages/winbindd.8.xml
@@ -22,7 +22,6 @@
                <command>winbindd</command>
                <arg choice="opt">-D|--daemon</arg>
                <arg choice="opt">-F|--foreground</arg>
-               <arg choice="opt">-S|--stdout</arg>
                <arg choice="opt">-i|--interactive</arg>
                <arg choice="opt">-d &lt;debug level&gt;</arg>
                <arg choice="opt">-s &lt;smb config file&gt;</arg>
@@ -160,13 +159,6 @@ hosts:             files wins
                </para></listitem>
                </varlistentry>
 
-               <varlistentry>
-               <term>-S|--stdout</term>
-               <listitem><para>If specified, this parameter causes
-               <command>winbindd</command> to log to standard output rather
-               than a file.</para></listitem>
-               </varlistentry>
-
                &stdarg.server.debug;
                &popt.common.samba;
                &popt.autohelp;

diff --git a/file_server/file_server.c b/file_server/file_server.c
index b55f13f5687632e3584437223a1411fbd1abfd6c..b8e53cd675cf2523babd90a01ad91e0df22b835f 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -86,7 +86,7 @@ static NTSTATUS s3fs_task_init(struct task_server *task)
                                "--option=server role check:inhibit=yes",
                                "--foreground",
                                config_file,
-                               debug_get_output_is_stdout()?"--log-stdout":NULL,
+                               debug_get_output_is_stdout()?"--debug-stdout":NULL,
                                NULL);
        /* the parent should not be able to call through nss_winbind */
        if (!winbind_off()) {

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 40efa36fdf343c3f0474bc562f288e1cedffa7cb..410b0458a4d758114cd0b8fa254e8cf4191f2ab8 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1847,7 +1847,7 @@ sub make_bin_cmd
                    "-l", $env_vars->{LOGDIR});
 
        if (not defined($dont_log_stdout)) {
-               push(@args, "--log-stdout");
+               push(@args, "--debug-stdout");
        }
        return (@preargs, $binary, @args, @optargs);
 }
@@ -1895,11 +1895,9 @@ sub check_or_start($$) {
 
        $binary = Samba::bindir_path($self, "winbindd");
        @full_cmd = $self->make_bin_cmd($binary, $env_vars,
-                                        $ENV{WINBINDD_OPTIONS}, $ENV{WINBINDD_VALGRIND}, "N/A");
-
-       if (not defined($ENV{WINBINDD_DONT_LOG_STDOUT})) {
-               push(@full_cmd, "--stdout");
-       }
+                                        $ENV{WINBINDD_OPTIONS},
+                                        $ENV{WINBINDD_VALGRIND},
+                                        $ENV{WINBINDD_DONT_LOG_STDOUT});
 
        # fork and exec() winbindd in the child process
        $daemon_ctx = {

diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 2311ad8dde361b5ec8338dc94d5ebe4295ae740e..05645967e053a3e2ac8d4d98d11016c2337d404b 100644 (file)
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -784,8 +784,7 @@ static bool open_sockets(bool isdaemon, int port)
                OPT_DAEMON = 1000,
                OPT_INTERACTIVE,
                OPT_FORK,
-               OPT_NO_PROCESS_GROUP,
-               OPT_LOG_STDOUT
+               OPT_NO_PROCESS_GROUP
        };
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -822,14 +821,6 @@ static bool open_sockets(bool isdaemon, int port)
                        .val        = OPT_NO_PROCESS_GROUP,
                        .descrip    = "Don't create a new process group",
                },
-               {
-                       .longName   = "log-stdout",
-                       .shortName  = 'S',
-                       .argInfo    = POPT_ARG_NONE,
-                       .arg        = NULL,
-                       .val        = OPT_LOG_STDOUT,
-                       .descrip    = "Log to stdout",
-               },
                {
                        .longName   = "hosts",
                        .shortName  = 'H',
@@ -906,9 +897,6 @@ static bool open_sockets(bool isdaemon, int port)
                case OPT_NO_PROCESS_GROUP:
                        no_process_group = true;
                        break;
-               case OPT_LOG_STDOUT:
-                       log_stdout = true;
-                       break;
                default:
                        d_fprintf(stderr, "\nInvalid option %s: %s\n\n",
                                  poptBadOption(pc, 0), poptStrerror(opt));
@@ -954,6 +942,7 @@ static bool open_sockets(bool isdaemon, int port)
        /* Ignore children - no zombies. */
        CatchChild();
 
+       log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
        if ( opt_interactive ) {
                Fork = False;
                log_stdout = True;
@@ -964,9 +953,7 @@ static bool open_sockets(bool isdaemon, int port)
                exit(1);
        }
 
-       if (log_stdout) {
-               setup_logging(argv[0], DEBUG_STDOUT);
-       } else {
+       if (!log_stdout) {
                setup_logging( argv[0], DEBUG_FILE);
        }
 

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index bb7820399cd91dd4b319988d48c8a81c051ac060..e40cc27d2b886d3a559e1ad4279977fb887b3302 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1555,7 +1555,6 @@ extern void build_options(bool screen);
                OPT_INTERACTIVE,
                OPT_FORK,
                OPT_NO_PROCESS_GROUP,
-               OPT_LOG_STDOUT
        };
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -1591,14 +1590,6 @@ extern void build_options(bool screen);
                        .val        = OPT_NO_PROCESS_GROUP,
                        .descrip    = "Don't create a new process group" ,
                },
-               {
-                       .longName   = "log-stdout",
-                       .shortName  = 'S',
-                       .argInfo    = POPT_ARG_NONE,
-                       .arg        = NULL,
-                       .val        = OPT_LOG_STDOUT,
-                       .descrip    = "Log to stdout" ,
-               },
                {
                        .longName   = "build-options",
                        .shortName  = 'b',
@@ -1707,9 +1698,6 @@ extern void build_options(bool screen);
                case OPT_NO_PROCESS_GROUP:
                        no_process_group = true;
                        break;
-               case OPT_LOG_STDOUT:
-                       log_stdout = true;
-                       break;
                case 'b':
                        print_build_options = True;
                        break;
@@ -1722,14 +1710,14 @@ extern void build_options(bool screen);
        }
        poptFreeContext(pc);
 
+       log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
+
        if (interactive) {
                Fork = False;
                log_stdout = True;
        }
 
-       if (log_stdout) {
-               setup_logging(argv[0], DEBUG_STDOUT);
-       } else {
+       if (!log_stdout) {
                setup_logging(argv[0], DEBUG_FILE);
        }
 

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 3b0fecf08a00be51acf844f18612b8e4ebbd8794..02da60cb9fa8aa8511aa1e38e7ac5224feba0bbb 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1589,19 +1589,10 @@ int main(int argc, const char **argv)
        enum {
                OPT_DAEMON = 1000,
                OPT_FORK,
-               OPT_NO_PROCESS_GROUP,
-               OPT_LOG_STDOUT
+               OPT_NO_PROCESS_GROUP
        };
        struct poptOption long_options[] = {
                POPT_AUTOHELP
-               {
-                       .longName   = "stdout",
-                       .shortName  = 'S',
-                       .argInfo    = POPT_ARG_NONE,
-                       .arg        = NULL,
-                       .val        = OPT_LOG_STDOUT,
-                       .descrip    = "Log to stdout",
-               },
                {
                        .longName   = "foreground",
                        .shortName  = 'F',
@@ -1702,8 +1693,6 @@ int main(int argc, const char **argv)
                        break;
                case 'i':
                        interactive = True;
-                       log_stdout = True;
-                       Fork = False;
                        break;
                 case OPT_FORK:
                        Fork = false;
@@ -1711,9 +1700,6 @@ int main(int argc, const char **argv)
                case OPT_NO_PROCESS_GROUP:
                        no_process_group = true;
                        break;
-               case OPT_LOG_STDOUT:
-                       log_stdout = true;
-                       break;
                case 'n':
                        opt_nocache = true;
                        break;
@@ -1745,6 +1731,12 @@ int main(int argc, const char **argv)
                exit(1);
        }
 
+       log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
+       if (interactive) {
+               Fork = true;
+               log_stdout = true;
+       }
+
        if (log_stdout && Fork) {
                d_fprintf(stderr, "\nERROR: "
                          "Can't log to stdout (-S) unless daemon is in foreground +(-F) or interactive (-i)\n\n");

diff --git a/source4/winbind/winbindd.c b/source4/winbind/winbindd.c
index 5a74db66159d4c38c83b23a9e17271cc1b363c26..7b6e3d9233399de33d5173944e824e13448b183c 100644 (file)
--- a/source4/winbind/winbindd.c
+++ b/source4/winbind/winbindd.c
@@ -85,7 +85,7 @@ static NTSTATUS winbindd_task_init(struct task_server *task)
                                "--option=server role check:inhibit=yes",
                                "--foreground",
                                config_file,
-                               debug_get_output_is_stdout()?"--stdout":NULL,
+                               debug_get_output_is_stdout()?"--debug-stdout":NULL,
                                NULL);
        if (subreq == NULL) {
                DEBUG(0, ("Failed to start winbindd as child daemon\n"));