X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fisrv_identd.c;h=e8ba007667255e51519062dc208a60355f551be5;hb=765b0eed3ef29a80115708c3249d3a541509cd24;hp=0279fc0bb6b4f7aead83aa9e0ab6166d80580352;hpb=b8b81a6f8fc8083ebef4a5557fe8e2121d623152;p=oweals%2Fbusybox.git

diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 0279fc0bb..e8ba00766 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -2,13 +2,13 @@
 /*
  * Fake identd server.
  *
- * Copyright (C) 2007 Denis Vlasenko
+ * Copyright (C) 2007 Denys Vlasenko
  *
  * Licensed under GPL version 2, see file LICENSE in this tarball for details.
  */
 
+#include "libbb.h"
 #include <syslog.h>
-#include "busybox.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)
 {
@@ -32,7 +32,7 @@ static int new_peer(isrv_state_t *state, int fd)
 	if (isrv_register_fd(state, peer, fd) < 0)
 		return peer; /* failure, unregister peer */
 
-	buf->fd_flag = fcntl(fd, F_GETFL, 0) | O_NONBLOCK;
+	buf->fd_flag = fcntl(fd, F_GETFL) | O_NONBLOCK;
 	isrv_want_rd(state, fd);
 	return 0;
 }
@@ -61,10 +61,11 @@ static int do_rd(int fd, void **paramp)
 	p = strpbrk(cur, "\r\n");
 	if (p)
 		*p = '\0';
-	if (!p && sz && buf->pos <= sizeof(buf->buf))
+	if (!p && sz && buf->pos <= (int)sizeof(buf->buf))
 		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);
@@ -75,7 +76,7 @@ static int do_rd(int fd, void **paramp)
 	return retval;
 }
 
-static int do_timeout(void **paramp)
+static int do_timeout(void **paramp UNUSED_PARAM)
 {
 	return 1; /* terminate session */
 }
@@ -91,13 +92,14 @@ static void inetd_mode(void)
 	while (do_rd(0, (void*)&buf) == 0);
 }
 
-int fakeidentd_main(int argc, char **argv)
+int fakeidentd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
 {
 	enum {
 		OPT_foreground = 0x1,
 		OPT_inetd      = 0x2,
 		OPT_inetdwait  = 0x4,
-		OPT_nodeamon   = 0x7,
+		OPT_fiw        = 0x7,
 		OPT_bindaddr   = 0x8,
 	};
 
@@ -105,14 +107,22 @@ int fakeidentd_main(int argc, char **argv)
 	unsigned opt;
 	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)) {
-		openlog(applet_name, 0, LOG_DAEMON);
+	opt = getopt32(argv, "fiwb:", &bind_address);
+	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, LOG_PID, LOG_DAEMON);
 		logmode = LOGMODE_SYSLOG;
 	}
 
@@ -124,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);