aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-01-14 13:12:06 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-01-14 13:12:06 +0000
commitd97c9244b18dbfc373465a111c9a17a28e84477d (patch)
tree141a5ae1628989a73dcb87419bbe555746e8b333
parentb8b81a6f8fc8083ebef4a5557fe8e2121d623152 (diff)
downloadbusybox-d97c9244b18dbfc373465a111c9a17a28e84477d.tar.gz
busybox-d97c9244b18dbfc373465a111c9a17a28e84477d.tar.bz2
Rename bb_sanitize_stdio -> bb_sanitize_server_stdio
(name is still bad - it doesn't hint that function may do daemonization trick for you if asked to). Small fixes to fakeidentd.
-rw-r--r--include/libbb.h2
-rw-r--r--libbb/xfuncs.c2
-rw-r--r--networking/inetd.c4
-rw-r--r--networking/isrv_identd.c19
4 files changed, 16 insertions, 11 deletions
diff --git a/include/libbb.h b/include/libbb.h
index c191dc2a0..1294fb75d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -279,7 +279,7 @@ extern void xsetgid(gid_t gid);
extern void xsetuid(uid_t uid);
extern void xdaemon(int nochdir, int noclose);
/* 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 xsetenv(const char *key, const char *value);
extern int xopen(const char *pathname, int flags);
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 6a6bdced3..84d47414a 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -509,7 +509,7 @@ void xdaemon(int nochdir, int noclose)
}
#endif
-void bb_sanitize_stdio(int daemonize)
+void bb_sanitize_server_stdio(int daemonize)
{
int fd;
/* Mega-paranoid */
diff --git a/networking/inetd.c b/networking/inetd.c
index fd2c88a6b..01f38ad60 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1292,9 +1292,9 @@ inetd_main(int argc, char *argv[])
/* reexec for vfork() do continue parent */
vfork_daemon_rexec(0, 0, argc, argv, "-f");
}
- bb_sanitize_stdio(0);
+ bb_sanitize_server_stdio(0);
#else
- bb_sanitize_stdio(!(opt & 2));
+ bb_sanitize_server_stdio(!(opt & 2));
#endif
openlog(applet_name, LOG_PID | LOG_NOWAIT, LOG_DAEMON);
logmode = LOGMODE_SYSLOG;
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 0279fc0bb..e757d7c29 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -65,6 +65,7 @@ static int do_rd(int fd, void **paramp)
goto ok;
/* Terminate session. If we are in server mode, then
* 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);
term:
free(buf);
@@ -97,7 +98,7 @@ int fakeidentd_main(int argc, char **argv)
OPT_foreground = 0x1,
OPT_inetd = 0x2,
OPT_inetdwait = 0x4,
- OPT_nodeamon = 0x7,
+ OPT_fiw = 0x7,
OPT_bindaddr = 0x8,
};
@@ -109,9 +110,14 @@ int fakeidentd_main(int argc, char **argv)
if (optind < argc)
bogouser = argv[optind];
- /* Daemonize if no -f or -i or -w */
- bb_sanitize_stdio(!(opt & OPT_nodeamon));
- if (!(opt & OPT_nodeamon)) {
+ /* Daemonize if no -f and no -i and no -w */
+ bb_sanitize_server_stdio(!(opt & OPT_fiw));
+ /* 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);
logmode = LOGMODE_SYSLOG;
}
@@ -124,9 +130,8 @@ int fakeidentd_main(int argc, char **argv)
/* Ignore closed connections when writing */
signal(SIGPIPE, SIG_IGN);
- if (opt & OPT_inetdwait) {
- fd = 0;
- } else {
+ fd = 0;
+ if (!(opt & OPT_inetdwait)) {
fd = create_and_bind_stream_or_die(bind_address,
bb_lookup_port("identd", "tcp", 113));
xlisten(fd, 5);