emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ftpd: stop unconditional logging to syslog. This was the only applet

Browse Source 
which was doing it. Added option -S to enable it when desired.

function                                             old     new   delta
packed_usage                                       25647   25666     +19
ftpd_main                                           1826    1825      -1
This commit is contained in:
Denis Vlasenko
2009-03-11 15:07:44 +00:00
parent a19e64933c
commit 4221e90ae4
3 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
networking/ftpd.c
View File

@ -80,7 +80,8 @@ enum {
OPT_l = (1 << 0),
OPT_1 = (1 << 1),
OPT_v = (1 << 2),
OPT_w = (1 << 3),
OPT_S = (1 << 3),
OPT_w = (1 << 4),
#define mk_const4(a,b,c,d) (((a * 0x100 + b) * 0x100 + c) * 0x100 + d)
#define mk_const3(a,b,c) ((a * 0x100 + b) * 0x100 + c)
@ -806,7 +807,7 @@ int ftpd_main(int argc, char **argv)
{
smallint opts;
opts = getopt32(argv, "l1v" USE_FEATURE_FTP_WRITE("w"));
opts = getopt32(argv, "l1vS" USE_FEATURE_FTP_WRITE("w"));
if (opts & (OPT_l|OPT_1)) {
/* Our secret backdoor to ls */
@ -828,11 +829,13 @@ int ftpd_main(int argc, char **argv)
* failure */
}
/* LOG_NDELAY is needed since we may chroot later */
openlog(applet_name, LOG_PID | LOG_NDELAY, LOG_DAEMON);
logmode |= LOGMODE_SYSLOG;
if (!(opts & OPT_v))
logmode = LOGMODE_SYSLOG;
logmode = LOGMODE_NONE;
if (opts & OPT_S) {
/* LOG_NDELAY is needed since we may chroot later */
openlog(applet_name, LOG_PID | LOG_NDELAY, LOG_DAEMON);
logmode |= LOGMODE_SYSLOG;
}
G.proc_self_fd = xopen("/proc/self", O_RDONLY | O_DIRECTORY);