* Original Author: Tomi Ollila <too@iki.fi>
* http://www.guru-group.fi/~too/sw/
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <sys/syslog.h>
-
-#include <pwd.h>
-#include <netdb.h>
-
+#include "busybox.h"
#include <sys/syslog.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <arpa/inet.h>
#include <sys/uio.h>
-#include "busybox.h"
#define IDENT_PORT 113
#define MAXCONNS 20
#define MAXIDLETIME 45
static const char ident_substr[] = " : USERID : UNIX : ";
-static const int ident_substr_len = sizeof(ident_substr) - 1;
+enum { ident_substr_len = sizeof(ident_substr) - 1 };
#define PIDFILE "/var/run/identd.pid"
/*
- * We have to track the 'first connection socket' so that we
+ * We have to track the 'first connection socket' so that we
* don't go around closing file descriptors for non-clients.
*
* descriptor setup normally
static const char *nobodystr = "nobody"; /* this needs to be declared like this */
static char *bind_ip_address = "0.0.0.0";
-static inline void movefd(int from, int to)
+static void movefd(int from, int to)
{
if (from != to) {
dup2(from, to);
else
port = se->s_port;
- if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
- bb_perror_msg_and_die("Cannot create server socket");
+ s = xsocket(AF_INET, SOCK_STREAM, 0);
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
- if (bind(s, (struct sockaddr *)&addr, len) < 0)
- bb_perror_msg_and_die("Cannot bind() port %i", IDENT_PORT);
-
- if (listen(s, 5) < 0)
- bb_perror_msg_and_die("Cannot listen() on port %i", IDENT_PORT);
+ xbind(s, (struct sockaddr *)&addr, len);
+ xlisten(s, 5);
movefd(s, 0);
}
-static void delpidfile(void)
+static void handlexitsigs(int signum)
{
- /*
- * Usually nobody has no write/delete access to directory /var/run/
- * therefore if file cannot be deleted, it is truncated
- */
if (unlink(PIDFILE) < 0)
close(open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0644));
-}
-
-static void handlexitsigs(int signum)
-{
- delpidfile();
exit(0);
}
switch (fork()) {
case -1:
- bb_perror_msg_and_die("Could not fork");
+ bb_perror_msg_and_die("fork");
case 0:
pw = getpwnam(nobodystr);
if (pw == NULL)
- bb_error_msg_and_die("Cannot find uid/gid of user '%s'", nobodystr);
+ bb_error_msg_and_die("cannot find uid/gid of user '%s'", nobodystr);
nobody = pw->pw_uid;
nogrp = pw->pw_gid;
writepid(nobody, nogrp);
close(0);
inetbind();
- if (setgid(nogrp)) bb_error_msg_and_die("Could not setgid()");
- if (setegid(nogrp)) bb_error_msg_and_die("Could not setegid()");
- if (setuid(nobody)) bb_error_msg_and_die("Could not setuid()");
- if (seteuid(nobody)) bb_error_msg_and_die("Could not seteuid()");
+ xsetgid(nogrp);
+ xsetuid(nobody);
close(1);
close(2);
setsid();
- openlog(bb_applet_name, 0, LOG_DAEMON);
return 1;
}
int fakeidentd_main(int argc, char **argv)
{
- int flag;
+ /* This applet is an inetd-style daemon */
+ openlog(applet_name, 0, LOG_DAEMON);
+ logmode = LOGMODE_SYSLOG;
memset(conns, 0, sizeof(conns));
memset(&G, 0, sizeof(G));
FD_SET(0, &G.readfds);
/* handle -b <ip> parameter */
- bb_getopt_ulflags(argc, argv, "b:", &bind_ip_address);
+ getopt32(argc, argv, "b:", &bind_ip_address);
/* handle optional REPLY STRING */
if (optind < argc)
G.identuser = argv[optind];
if (s < 0) {
if (errno != EINTR) /* EINTR */
- syslog(LOG_ERR, "accept: %s", strerror(errno));
+ bb_perror_msg("accept");
} else {
if (G.conncnt == MAXCONNS)
i = closeOldest();