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

Rename bb_sanitize_stdio -> bb_sanitize_server_stdio

Browse Source 
(name is still bad - it doesn't hint that function
may do daemonization trick for you if asked to).
Small fixes to fakeidentd.
This commit is contained in:
Denis Vlasenko 2007-01-14 13:12:06 +00:00
parent b8b81a6f8f
commit d97c9244b1
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libbb.h
View File

@ -279,7 +279,7 @@ extern void xsetgid(gid_t gid);
extern void xsetuid(uid_t uid); extern void xsetuid(uid_t uid);
extern void xdaemon(int nochdir, int noclose); extern void xdaemon(int nochdir, int noclose);
/* More clever/thorough xdaemon */ /* More clever/thorough xdaemon */
extern void bb_sanitize_stdio(int daemonize); extern void bb_sanitize_server_stdio(int daemonize);
extern void xchdir(const char *path); extern void xchdir(const char *path);
extern void xsetenv(const char *key, const char *value); extern void xsetenv(const char *key, const char *value);
extern int xopen(const char *pathname, int flags); extern int xopen(const char *pathname, int flags);

2
libbb/xfuncs.c
View File

@ -509,7 +509,7 @@ void xdaemon(int nochdir, int noclose)
} }
#endif #endif
void bb_sanitize_stdio(int daemonize) void bb_sanitize_server_stdio(int daemonize)
{ {
int fd; int fd;
/* Mega-paranoid */ /* Mega-paranoid */

4
networking/inetd.c
View File

@ -1292,9 +1292,9 @@ inetd_main(int argc, char *argv[])
/* reexec for vfork() do continue parent */ /* reexec for vfork() do continue parent */
vfork_daemon_rexec(0, 0, argc, argv, "-f"); vfork_daemon_rexec(0, 0, argc, argv, "-f");
} }
bb_sanitize_stdio(0); bb_sanitize_server_stdio(0);
#else #else
bb_sanitize_stdio(!(opt & 2)); bb_sanitize_server_stdio(!(opt & 2));
#endif #endif
openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON); openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
logmode = LOGMODE_SYSLOG; logmode = LOGMODE_SYSLOG;

19
networking/isrv_identd.c
View File

@ -65,6 +65,7 @@ static int do_rd(int fd, void **paramp)
goto ok; goto ok;
/* Terminate session. If we are in server mode, then /* Terminate session. If we are in server mode, then
* fd is still in nonblocking mode - we never block here */ * fd is still in nonblocking mode - we never block here */
if (fd == 0) fd++; /* inetd mode? then write to fd 1 */
fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser); fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser);
term: term:
free(buf); free(buf);
@ -97,7 +98,7 @@ int fakeidentd_main(int argc, char **argv)
OPT_foreground = 0x1, OPT_foreground = 0x1,
OPT_inetd = 0x2, OPT_inetd = 0x2,
OPT_inetdwait = 0x4, OPT_inetdwait = 0x4,
OPT_nodeamon = 0x7, OPT_fiw = 0x7,
OPT_bindaddr = 0x8, OPT_bindaddr = 0x8,
}; };
@ -109,9 +110,14 @@ int fakeidentd_main(int argc, char **argv)
if (optind < argc) if (optind < argc)
bogouser = argv[optind]; bogouser = argv[optind];
/* Daemonize if no -f or -i or -w */ /* Daemonize if no -f and no -i and no -w */
bb_sanitize_stdio(!(opt & OPT_nodeamon)); bb_sanitize_server_stdio(!(opt & OPT_fiw));
if (!(opt & OPT_nodeamon)) { /* Where to log in inetd modes? "Classic" inetd
* probably has its stderr /dev/null'ed (we need log to syslog?),
* but daemontools-like utilities usually expect that children
* log to stderr. I like daemontools more. Go their way.
* (Or maybe we need yet another option "log to syslog") */
if (!(opt & OPT_fiw) /* || (opt & OPT_syslog) */) {
openlog(applet_name, 0, LOG_DAEMON); openlog(applet_name, 0, LOG_DAEMON);
logmode = LOGMODE_SYSLOG; logmode = LOGMODE_SYSLOG;
} }
@ -124,9 +130,8 @@ int fakeidentd_main(int argc, char **argv)
/* Ignore closed connections when writing */ /* Ignore closed connections when writing */
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
if (opt & OPT_inetdwait) { fd = 0;
fd = 0; if (!(opt & OPT_inetdwait)) {
} else {
fd = create_and_bind_stream_or_die(bind_address, fd = create_and_bind_stream_or_die(bind_address,
bb_lookup_port("identd", "tcp", 113)); bb_lookup_port("identd", "tcp", 113));
xlisten(fd, 5); xlisten(fd, 5);