sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

s3: Remove --log-stdout from daemons

Browse Source 
The common cmdline parser provides --debug-stdout.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2021-01-11 09:52:36 +01:00 committed by Andrew Bartlett
parent c7b1d2d11c
commit 3467214cf9
9 changed files with 19 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs-xml/manpages/nmbd.8.xml
View File

@ -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

8
docs-xml/manpages/smbd.8.xml
View File

@ -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

8
docs-xml/manpages/winbindd.8.xml
View File

@ -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;

2
file_server/file_server.c
View File

@ -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()) {

10
selftest/target/Samba3.pm
View File

@ -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 = {

19
source3/nmbd/nmbd.c
View File

@ -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);
}

18
source3/smbd/server.c
View File

@ -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);
}

22
source3/winbindd/winbindd.c
View File

@ -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");

2
source4/winbind/winbindd.c
View File

@ -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"));