start_stop_daemon: NOMMU fixes, round 2 by Alex Landau <landau_alex@yahoo.com>

[oweals/busybox.git] / networking / isrv_identd.c

diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 389103920e96deb5ef8b1724ae40b9c36cc360ce..84cf6da6a05dab7cd533c9061a57b73b0cd437b9 100644 (file)
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -8,7 +8,7 @@
  */
 
 #include <syslog.h>
-#include "busybox.h"
+#include "libbb.h"
 #include "isrv.h"
 
 enum { TIMEOUT = 20 };
@@ -19,7 +19,7 @@ typedef struct identd_buf_t {
        char buf[64 - 2*sizeof(int)];
 } identd_buf_t;
 
-static const char *bogouser = "nobody";
+#define bogouser bb_common_bufsiz1
 
 static int new_peer(isrv_state_t *state, int fd)
 {
@@ -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);
@@ -83,20 +84,22 @@ static int do_timeout(void **paramp)
 static void inetd_mode(void)
 {
        identd_buf_t *buf = xzalloc(sizeof(*buf));
+       /* buf->pos = 0; - xzalloc did it */
        /* We do NOT want nonblocking I/O here! */
-       buf->fd_flag = fcntl(0, F_GETFL, 0);
+       /* buf->fd_flag = 0; - xzalloc did it */
        do
                alarm(TIMEOUT);
-       while (do_rd(0, (void*)&buf) == 0) /* repeat */;
+       while (do_rd(0, (void*)&buf) == 0);
 }
 
+int fakeidentd_main(int argc, char **argv);
 int fakeidentd_main(int argc, char **argv)
 {
        enum {
                OPT_foreground = 0x1,
                OPT_inetd      = 0x2,
                OPT_inetdwait  = 0x4,
-               OPT_nodeamon   = 0x7,
+               OPT_fiw        = 0x7,
                OPT_bindaddr   = 0x8,
        };
 
@@ -105,12 +108,20 @@ int fakeidentd_main(int argc, char **argv)
        int fd;
 
        opt = getopt32(argc, argv, "fiwb:", &bind_address);
-       if (optind < argc)
-               bogouser = argv[optind];
-
-       /* Daemonize if no -f or -i or -w */
-       bb_sanitize_stdio(!(opt & OPT_nodeamon));
-       if (!(opt & OPT_nodeamon)) {
+       strcpy(bogouser, "nobody");
+       if (argv[optind])
+               strncpy(bogouser, argv[optind], sizeof(bogouser));
+
+       /* Daemonize if no -f and no -i and no -w */
+       if (!(opt & OPT_fiw));
+               bb_daemonize_or_rexec(0, argv);
+
+       /* 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;
        }
@@ -123,9 +134,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);