Date: Fri, 13 Sep 2019 02:08:08 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511912 - in head/security/fakeident: . files Message-ID: <201909130208.x8D288C3071942@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Fri Sep 13 02:08:08 2019 New Revision: 511912 URL: https://svnweb.freebsd.org/changeset/ports/511912 Log: - update to 2.7 - code has shifted to new site - update pkg-descr - pet portlint and rclint PR: 240175 Approved by: dean@odyssey.apana.org.au (maintainer timeout) Relnotes: http://www.guru-group.fi/~too/sw/identd.readme Modified: head/security/fakeident/Makefile head/security/fakeident/files/fakeidentd.in head/security/fakeident/files/identd.c head/security/fakeident/pkg-descr Modified: head/security/fakeident/Makefile ============================================================================== --- head/security/fakeident/Makefile Fri Sep 13 00:18:00 2019 (r511911) +++ head/security/fakeident/Makefile Fri Sep 13 02:08:08 2019 (r511912) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fakeident -PORTVERSION= 1.7 -PORTREVISION= 3 +PORTVERSION= 2.7 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty @@ -15,11 +14,12 @@ COMMENT= Tool that replies with a standard answer to i LICENSE= GPLv2+ PLIST_FILES= sbin/identd + USE_RC_SUBR= fakeidentd do-build: - @${MKDIR} ${WRKSRC} - ${CC} ${CFLAGS} -o ${WRKSRC}/identd ${FILESDIR}/identd.c + @${MKDIR} ${WRKSRC} && ${CP} ${FILESDIR}/identd.c ${WRKSRC} + cd ${WRKSRC} && ${SH} identd.c CC=${CC} ${CFLAGS} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/identd ${STAGEDIR}${PREFIX}/sbin Modified: head/security/fakeident/files/fakeidentd.in ============================================================================== --- head/security/fakeident/files/fakeidentd.in Fri Sep 13 00:18:00 2019 (r511911) +++ head/security/fakeident/files/fakeidentd.in Fri Sep 13 02:08:08 2019 (r511912) @@ -17,13 +17,14 @@ # The username does not need to exist anywhere in your system. name=fakeidentd +desc="Standalone 'fake' ident daemon" rcvar=fakeidentd_enable load_rc_config $name : ${fakeidentd_enable:="NO"} -command=%%PREFIX%%/sbin/identd +command="%%PREFIX%%/sbin/identd" pidfile=/var/run/identd.pid command_args="nobody && echo -n ' fakeidentd'" Modified: head/security/fakeident/files/identd.c ============================================================================== --- head/security/fakeident/files/identd.c Fri Sep 13 00:18:00 2019 (r511911) +++ head/security/fakeident/files/identd.c Fri Sep 13 02:08:08 2019 (r511912) @@ -1,26 +1,46 @@ -#if 0 /* -# This program is easy to compile. For example the following ways: -# $ sh identd.c -# $ sh identd.c -g -DDEBUG -# $ sh identd.c -s -DXXXMULTI -# $ CC=cc sh identd.c -# $ CC=egcs sh identd.c -s -fomit-frame-pointer +#if 0 /* -*- mode: c; c-file-style: "gnu"; tab-width: 8; -*- -NAME=`basename $0 .c` -[ x`uname` = xSunOS ] && L="-lsocket -lnsl" || L= -[ x$1 = x ] && set -- -s -O2 -CMDLINE="${CC:-gcc} -Wall $@ -o $NAME $NAME.c $L" -echo $CMDLINE; exec $CMDLINE; exit -1 +# This program is easy to compile. For example the following ways: +# $ sh identd.c +# $ sh identd.c -g -DDEBUG +# $ sh identd.c -s -DXXXMULTI +# $ sh identd.c TRG=fake_identd -s -DBIND_ADDRESS=127.0.0.1 +# $ sh identd.c CC=cc +# $ sh identd.c CC=egcs -s -fomit-frame-pointer +set -eu + +CC= TRG=`basename "$0" .c` OIFS=$IFS +for arg in "$@" '' +do case $arg in TRG=*) TRG=`echo "$arg" | sed 's/TRG=//'`; shift ;; + CC=*) CC=`echo "$arg" | sed 's/CC=//'`; shift ;; + clean) set -x; exec rm -f "$TRG" ;; + readme) set -x; exec sed -n '1,/[e]nd/d;/\*\//q;s/..//p' "$0";; + '') set 0 -s -O2; shift; break ;; + *) break ;; +esac; done +case `uname` in SunOS) L='-lsocket -lnsl' ;; *) L= ;; esac + +WARN="-Wall -Wstrict-prototypes -pedantic -Wno-long-long" +WARN="$WARN -Wcast-align -Wpointer-arith " # -Wfloat-equal #-Werror +WARN="$WARN -W -Wwrite-strings -Wcast-qual -Wshadow" # -Wconversion + +VERSION=`sed -n '/^ [*] Version / { + s/.*Version \([^ ]*\) *\([^ ]*\).*./\1 (\2)/p; q; }' "$0"` +case $VERSION in '') echo Could not read version information. >&2; exit 1; esac +TRGNAME=`basename "$TRG"` +set -x; exec ${CC:-gcc} $WARN "$@" -DTRG="\"$TRGNAME\"" \ + -DVERSION="\"$VERSION\"" -o "$TRG" "$0" $L +exit 1 # */ #endif /* - * $Id: identd.c,v 1.7 2002/09/29 07:50:20 too Stab $ + * identd.c 2.6 2012-05-31 20:37:27 UTC * - * Author: Tomi Ollila <too@iki.fi> + * Author: Tomi Ollila -- too ät iki fi * - * Created: Sat Nov 25 15:34:07 1995 too - * Last modified: Sun Sep 29 10:48:42 2002 too + * Created: Sat Nov 25 15:34:07 EET 1995 too + * Last modified: Thu 31 May 2012 23:37:27 EEST too * * This program is standalone 'fake' ident daemon. This program does * not fork() but is configured to handle up to 20 concurrent connections. @@ -28,7 +48,7 @@ echo $CMDLINE; exec $CMDLINE; exit -1 * in use, the next connection will close the oldest connection data * has been read. This way this program is not very vulnerable to so * called `denial of service' attack, thus making this ideal "identd" - * to be used in a firewall. + * to be used in a firewall, IP masquerading hosts etc. * * Program takes one (or many) arguments, which if exist, determines the * `user' name(s) that is returned for successful ident query. @@ -44,17 +64,51 @@ echo $CMDLINE; exec $CMDLINE; exit -1 * GNU General Public License for more details. * * HISTORY - * $Log: identd.c,v $ * + * Version 2.6 2012-05-31 20:37:27 UTC + * Applied patches from the wl500g project, including IPv6 support, with + * minor tweaks (patches provided by Daniel Gimpelevich. Thanks). + * + * Version 2.5 $Id: identd.c 862 2006-05-18 14:16:34Z too $ + * Minor build and readme updates. + * + * Version 2.4 identd.c 568 2005-09-07 20:18:39Z too + * More compilation warnings options set -- iov.base being non-const + * gives warnings that are hard to avoid... + * + * Version 2.3 identd.c 564 2005-09-06 19:15:20Z too + * Randident code from Matthias Jung tuned in. + * + * Version 2.2 identd.c 12 2004-09-08 21:46:54Z too + * Fixed getservbyname() to look port for "auth" instead of "identd" + * port. This "bug" also revealed port number byte order handling bug, + * which was fixed. + * Now this file is stored in subversion repository -- I entered + * $ svn propset svn:keywords Id identd.c -- let's see how it works... + * ... ``svn propset svn:keywords 'Id Rev' identd.c'' !!! + * + * Revision 2.1 2004/01/15 18:14:42 too + * Made BIND_ADDRESS definable (in compiler command line). + * Added some typecasts (using checked_cast() macro). + * Thanks to Jeffrey D. Wheelhouse for his content. + * + * Revision 2.0 2003/05/05 15:21:01 too + * Major update. Removed fdprintf(); replaced with use of + * writev() and newly added outputstrings(). + * Removed many now obsolete defines and converted one to + * constant character string. + * Added one assert() (and left room for more). Did some + * relativily small other adjustments. + * * Revision 1.7 2002/09/29 07:50:20 too * No longer chops up to IDSTR_MAX chars, but uses "%.*s" to limit length; - * now works also when XXXMULTI defined. + * now works also when XXXMULTI defined. * Back-hacked self-compilable trick, with more tricks to avoid compiler - * warnings. + * warnings. * Removed own define of FD_SETSIZE altogether; - * systems has it small to begin with. + * systems has it small to begin with. * Line '415' (or whatever that is now) fixed. () -> (void) in func def. - * Some fine tuning. + * Some fine-tuning. * Thanks to Cristian for his patches. * * Revision 1.6.1 2002-09-28 12:30:29 +0200 cii @@ -83,40 +137,46 @@ echo $CMDLINE; exec $CMDLINE; exit -1 * + added IDENT_SUBSTR * * Revision 1.6 2002/07/31 16:25:20 too - * Now works when started as root (in Linux). Stupid me, tested - * only starting as an ordinary loser. + * Now works when started as root (in Linux). Stupid me, tested + * only starting as an ordinary loser. * * Revision 1.5 2002/07/29 14:02:42 too - * Added possibility to have multible reply users, one (pseudo)randomly - * chosen at each time. + * Added possibility to have multible reply users, one (pseudo)randomly + * chosen at each time. * * Revision 1.4 2001/02/09 08:45:42 too - * Now GID is also changed to nobody/nogroup. + * Now GID is also changed to nobody/nogroup. * * Revision 1.3 2000/06/07 05:55:44 too - * Fixed some Solaris compilation "bugs". - * Changed LOG_PERROR to LOG_CONS + * Fixed some Solaris compilation "bugs". + * Changed LOG_PERROR to LOG_CONS * * Revision 1.2 1999/07/30 04:08:42 too - * Added printing version string (and exit) with `-V' command line option. + * Added printing version string (and exit) with `-V' command line option. * * Revision 1.1 1999/04/21 17:23:20 too * - Writes process id to /var/run/identd.pid. * - Changes (effective) user id to `nobody' after initialization - * (binding socket etc.). + * (binding socket etc.). * - Ignores some signals (HUP and PIPE). * - Handles some signals that aborts by default. The handler function - * tries to get rid of the pidfile. + * tries to get rid of the pidfile. * * Revision 0.9b 1999/04/15 20:45:12 too - * Not so much spaghetti anymore. Added documentation and more replies. + * Not so much spaghetti anymore. Added documentation and more replies. * * Revision 0.9 1999/04/12 18:30:00 too - * Version for unix systems. Standalone, supports 20 concurrent connections. - * The code is quite a spaghetti. But that does not matter. - * + * Version for unix systems. Standalone, supports 20 concurrent connections. + * The code is quite a spaghetti. But that does not matter. */ +#ifdef DEBUG +#undef ndebug +#else +#define ndebug 1 +#endif + +#include <assert.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -136,34 +196,87 @@ echo $CMDLINE; exec $CMDLINE; exit -1 #include <sys/socket.h> #include <netinet/in.h> #include <errno.h> +#include <arpa/inet.h> +#include <sys/uio.h> +#include <sys/endian.h> +#if __BYTE_ORDER == __BIG_ENDIAN + +#define IPADDR(a,b,c,d) ((in_addr_t)((a << 24) + (b << 16) + (c << 8) + d)) +#define IPPORT(v) ((in_port_t)v) +#define A_x_256(a)((a<<8)) + +#elif __BYTE_ORDER == __LITTLE_ENDIAN + +#define IPADDR(a,b,c,d) (a + (b << 8) + (c << 16) + (d << 24)) +#define IPPORT(v) ((in_port_t)((v >> 8) | (v << 8))) +#define A_x_256(a) (a) + +#else +#error unknown ENDIAN +#endif + +#ifndef __STRING +#define __STRING(x) #x +#endif +/* Let's see how long-lived this is... */ +#define __STRINGIFY_MACRO(x) __STRING(x) + +#ifndef BIND_ADDRESS +#define BIND_ADDRESS 0.0.0.0 +#endif +#ifndef BIND_ADDRESS6 +#define BIND_ADDRESS6 :: +#endif #define IDENT_PORT 113 -#define IDENT_SUBSTR ": USERID : UNIX :" #define MAXCONNS 20 #define MAXIDLETIME 45 -#define IDSTR_BUFLEN 128 /*could be dropped down to 64 if tight in memory */ -/* - * format string is: "%d, %d " IDENT_SUBSTR " %.*s\r\n" - * %d is max 999999999 (allowed by this identd, - */ -#define IDSTR_MAX (IDSTR_BUFLEN - 1) - \ - 9 - 2 - 9 - 1 - (sizeof IDENT_SUBSTR - 1) - 1 - 2 +#ifndef USE_UNIX_OS +static const char ident_substr[] = " : USERID : OTHER : "; +#else +static const char ident_substr[] = " : USERID : UNIX : "; +#endif +static const int ident_substr_len = sizeof ident_substr - 1; +#if !defined __cplusplus +typedef enum { false = 0, true = 1 } bool; +#endif + +#if (__GNUC__ >= 3) +#define GCCATTR_UNUSED __attribute ((unused)) + +#define from_type(ft, v) \ + __builtin_choose_expr (__builtin_types_compatible_p (typeof (v), ft), \ + (v), (void)0) + +#define checked_cast(ft, tt, v) \ + __builtin_choose_expr (__builtin_types_compatible_p (typeof (v), ft), \ + ((tt)(v)), (void)0) +#else +#define GCCATTR_UNUSED + +#define from_type(ft, v) (v) +#define checked_cast(ft, tt, v) ((tt)(v)) +#endif + +/* ... */ +#define CVP (const void *) + #ifndef DEBUG #define FCS 2 /* First Connection Socket */ -#define TRACE(x); +#define TRACE(x, y); #else #define FCS 4 -#define TRACE(x) printf x +#define TRACE(x, y) if (x) printf y #endif /* descriptors when debugging: * 0 = server socket * 1 = standard output (debugging output) * 2 = standard error - * 3 = syslog fd (hopefully -- otherwise this won't work) + * 3 = syslog fd (hopefully -- otherwise may work a bit wierdly) * 4 - 4 + MAXCONNS = connection sockets * * descriptors when not debugging @@ -171,6 +284,10 @@ echo $CMDLINE; exec $CMDLINE; exit -1 * 1 = syslog fd (hopefully -- otherwise this won't work) * 2 = connection socket after detached from tty. standard error before that * 3 - 2 + MAXCONNS = rest connection sockets + * + * To try to make sure that syslog fd is what is "requested", the that fd + * is closed before openlog() call. It can only severely fail if fd 0 + * is initially closed. */ /* @@ -191,11 +308,11 @@ struct { * XXX NOTE: multi currently only slightly tested XXXX. */ #ifdef XXXMULTI -#define IU_IN_STRUCT char ** identuserlist; int identusers +#define IU_IN_STRUCT const char * const * identuserlist; int identusers #define SET_IU(s, c) do { G.identuserlist = &(s); G.identusers = c; } while (0) #define IU_IN_USAGESTR "[identuser [identuser2...]]" #else -#define IU_IN_STRUCT char * identuser +#define IU_IN_STRUCT const char * identuser #define SET_IU(s, c) G.identuser = (s) #define IU_IN_USAGESTR "[identuser]" #endif @@ -205,82 +322,104 @@ struct { IU_IN_STRUCT; fd_set readfds; int conncnt; + bool randident; } G; -static const char rcs_id[] = -/* */ "$Id: identd.c,v 1.7 2002/09/29 07:50:20 too Stab $"; - - /* * Prototypes */ static void reply(int s, char * buf); -static void replyError(int s, char * buf); +static void replyError(int s, const char * buf); static const char * strerrno(void); -const int one = 1; -char * nobodystr = "nobody"; +static const int one = 1; +static const char * const nobodystr = "nobody"; +static const char * alphanum = + "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; -/* a more general name would be `movefd',but we are only moving sockets here */ -static inline void movesocket(int from, int to) +static inline void movefd(int from, int to) { - TRACE(("movesocket(from = %d, to = %d)\n", from, to)); - dup2(from, to); - close(from); + TRACE(1, ("movefd(from = %d, to = %d)\n", from, to)); + if (from != to) + { + dup2(from, to); + close(from); + } } /* * inetbind() must always return 0 or value < 0. + * ... i.e. this version -- saves need for storage of the return value. */ + +#if 0 /* unused */ static int inetbind(int port) { - int s; - struct sockaddr_in addr = { 0 }; - int len = sizeof addr; - + return inetbind(htons(port)); +} +#endif + +static int inetbind(int ipport) +{ + int s, len; + union { + struct sockaddr_in sin4; + struct sockaddr_in6 sin6; + } addr; + close(0); - - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) - { - syslog(LOG_CRIT, "cannot create server socket: %s.", strerrno()); + memset(&addr, 0, sizeof addr); + + if ((s = socket(AF_INET6, SOCK_STREAM, 0)) >= 0) + { + len = sizeof addr.sin6; + inet_pton(AF_INET6, __STRINGIFY_MACRO(BIND_ADDRESS6), &addr.sin6.sin6_addr); + addr.sin6.sin6_family = AF_INET6; + addr.sin6.sin6_port = ipport; + } + else + if ((s = socket(AF_INET, SOCK_STREAM, 0)) >= 0) + { + len = sizeof addr.sin4; + addr.sin4.sin_addr.s_addr = inet_addr(__STRINGIFY_MACRO(BIND_ADDRESS)); + addr.sin4.sin_family = AF_INET; + addr.sin4.sin_port = ipport; + } + else + { + syslog(LOG_CRIT, "Can not create server socket: %s.", strerrno()); return -1; - } - + } + 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) - { - syslog(LOG_CRIT, "cannot bind() server socket: %s.", strerrno()); + { + syslog(LOG_CRIT, "Can not bind() server socket: %s.", strerrno()); return -1; - } - + } + if (listen(s, 5) < 0) - { - syslog(LOG_CRIT, "cannot listen() server socket: %s.", strerrno()); + { + syslog(LOG_CRIT, "Can not listen() server socket: %s.", strerrno()); return -1; - } - - if (s != 0) - { - movesocket(s, 0); - } - + } + + movefd(s, 0); + return 0; } static void deleteConn(int s) { int i = s - FCS; - - TRACE(("deleteConn(): socket %d, conncnt %d\n", s, G.conncnt)); - + + TRACE(1, ("deleteConn(): socket %d, conncnt %d\n", s, G.conncnt)); + close(s); - + G.conncnt--; - + /* * Most of the time there is 0 connections. Most often that there * is connections, there is just one connection. When this one connection @@ -294,14 +433,14 @@ static void deleteConn(int s) * to be copied over the time all these connections are deleted. */ if (i != G.conncnt) - { + { memcpy(&conns[i], &conns[G.conncnt], sizeof conns[0]); - movesocket(G.conncnt + FCS, s); - } - - TRACE(("Clearing fd %d, readfds now 0x%x\n\n", - G.conncnt + FCS, *(int *)&G.readfds)); - + movefd(G.conncnt + FCS, s); + } + + TRACE(1, ("Clearing fd %d, readfds now 0x%x\n\n", + G.conncnt + FCS, *(int *)&G.readfds)); + FD_CLR(G.conncnt + FCS, &G.readfds); } @@ -310,35 +449,28 @@ static int closeOldest(void) time_t min = conns[0].lasttime; int idx = 0; int i; - + for (i = 1; i < MAXCONNS; i++) - { - if (conns[i].lasttime < min) - { - idx = i; - } - } - TRACE(("closeOldest(): index %d, socket %d\n", idx, idx + FCS)); - + if (conns[i].lasttime < min) + idx = i; + + TRACE(1, ("closeOldest(): index %d, socket %d\n", idx, idx + FCS)); + replyError(idx + FCS, "X-SERVER-TOO-BUSY"); close(idx + FCS); - + return idx; } -static inline int checkInput(char * buf, int len, int l) +static int checkInput(char * buf, int len, int l) { int i; - + for (i = len; i < len + l; i++) - { - if (buf[i] == '\n') - { - return 1; - } - } - + if (buf[i] == '\n') + return 1; + return 0; } @@ -346,57 +478,56 @@ static inline int checkInput(char * buf, int len, int static int getport(void) { struct servent * se; - - if ((se = getservbyname("identd", "tcp")) == NULL) - { - return IDENT_PORT; - } + + if ((se = getservbyname("auth", "tcp")) == NULL) + return IPPORT(IDENT_PORT); else - { - return se->s_port; - } + return se->s_port; } static const char * strerrno() { +#if 1 + return strerror(errno); +#else + extern char * sys_errlist[]; return sys_errlist[errno]; +#endif } -/* here we trust no-one in this program overflows our data buffer. */ -static void fdprintf(int fd, char * format, ...) +#define WriteCS(f, s) write(f, s, sizeof s - 1) + +static void writestrings(int fd, const char * str, ...) { - va_list ap; - char buf[IDSTR_BUFLEN]; - - va_start(ap, format); - vsprintf(buf, format, ap); + va_list ap; + + va_start(ap, str); + + while (str) + { + write(fd, str, strlen(str)); + str = va_arg(ap, const char *); + } va_end(ap); - - write(fd, buf, strlen(buf)); } - #ifndef DEBUG static void godaemon(void) { switch(fork()) - { - case -1: - exit(-1); - - case 0: - close(1); - close(2); - setsid(); - break; - - default: - exit(0); - } + { + case -1: exit(-1); + case 0: close(1); close(2); setsid(); break; + default: exit(0); + } } #endif +#ifdef TRG +#define PIDFILE "/var/run/" TRG ".pid" +#else #define PIDFILE "/var/run/identd.pid" +#endif static void delpidfile(void) { @@ -405,9 +536,7 @@ static void delpidfile(void) * therefore if file cannot be deleted, it is truncated */ if (unlink(PIDFILE) < 0) - { - close(open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0644)); - } + close(open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0644)); } static void handlexitsigs(void) @@ -420,151 +549,119 @@ static void writepid(uid_t nobody, uid_t nogrp) /* May succeed. If not, won't care. */ { int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664); - + char buf[24]; + if (fd < 0) - { - return; - } - - fdprintf(fd, "%d\n", getpid()); + return; + + /* we don't use snprintf() here since it is not so portable...*/ + /* Anyway, 64-bit integer is at max 20 characters long. */ + sprintf(buf, "%d\n", getpid()); + buf[23] = '\0'; + write(fd, buf, strlen(buf)); fchown(fd, nobody, nogrp); close(fd); - + signal(SIGTERM, (void(*)(int))handlexitsigs); signal(SIGINT, (void(*)(int))handlexitsigs); signal(SIGQUIT, (void(*)(int))handlexitsigs); /* should this handle ILL, ... (see signal(7)) */ } -/* parses the `rcs_id' string for version information and prints the info. */ -static void printversion(char nameterm) +static void printversion(void) { - struct { - const char * p; - int l; + struct iovec iv[4]; - } s[4] = { { 0 } }; + iv[0].iov_base = TRG; + iv[0].iov_len = sizeof TRG - 1; - int i; - const char * p; - - for (i = 0, p = rcs_id; *p && i < 4 ; i++) - { - while (*p != ' ' && *p != '\0') - { - p++; - } - if (*p++ == ' ' && *p != '\0') - { - s[i].p = p; - } - } - - if (s[0].p) - { - p = s[0].p; - while (*p != nameterm && *p != ' ') - { - p++; - } - s[0].l = p - s[0].p; - } - else - { - s[0].p = "unknown"; - s[0].l = 7; - } - - for (i = 1; i < 3; i++) - { - if (s[i+1].p) - { - s[i].l = s[i+1].p - s[i].p - 1; - } - else - { - s[i].p = "unknown"; s[i].l = 7; - } - } - - fdprintf(1, "%.*s %.*s (%.*s)\n", - s[0].l, s[0].p, /**/ s[1].l, s[1].p, /**/ s[2].l, s[2].p); + iv[1].iov_base = " "; + iv[1].iov_len = 1; + + iv[2].iov_base = VERSION; + iv[2].iov_len = sizeof VERSION - 1; + + iv[3].iov_base = ".\n"; + iv[3].iov_len = 2; + + writev(1, iv, 4); } -int main(int argc, char * argv[]) +int main(int argc GCCATTR_UNUSED, const char * argv[]) { uid_t nobody, nogrp; - + memset(conns, 0, sizeof conns); memset(&G, 0, sizeof G); FD_ZERO(&G.readfds); FD_SET(0, &G.readfds); - + + TRACE(1, ("s: `%s', l = %d\n", ident_substr, ident_substr_len)); + if (argv[1]) - { - if (argv[1][0] == '-') - { - if (argv[1][1] == 'V') + if (argv[1][0] == '-') { + if (argv[1][1] == 'V') + { + printversion(); + return 0; + } + else + { + if (argv[1][1] == 'r') { - printversion('.'); - return 0; + G.randident = true; + srand(time(0)); } - else + else { - fdprintf(2, "%s: invalid option -- %c\n", argv[0], argv[1][1]); - fdprintf(2, "Usage: %s [-V] " IU_IN_USAGESTR "\n", argv[0]); - return 1; + char b[2]; b[0] = argv[1][1]; b[1]= '\0'; + + writestrings(2, argv[0], ": invalid option -- ", b, ".\n", + "Usage: ", argv[0], " [-rV] ", IU_IN_USAGESTR "\n", + NULL); + return 1; } - } - else - { - SET_IU(argv[1], argc - 1); - } - } + }} + else + SET_IU(argv[1], argc - 1); else - { - SET_IU(nobodystr, 1); - } - - + SET_IU(nobodystr, 1); + + #ifndef DEBUG close(1); /* not debugging, openlog() hopefully uses fd 1. */ #else close(3); /* debugging, TRACE uses fd 1, openlog() hopefully fd 3 */ #endif - + openlog("identd", LOG_CONS, LOG_DAEMON); - + { - struct passwd * pw = getpwnam(nobodystr); - - if (pw) + struct passwd * pw = getpwnam(nobodystr); + + if (pw) { - nobody = pw->pw_uid; - nogrp = pw->pw_gid; + nobody = pw->pw_uid; + nogrp = pw->pw_gid; } - else + else { - syslog(LOG_CRIT, "Cannot find user `nobody': %s", strerrno()); - return -1; + syslog(LOG_CRIT, "Can not find user `nobody': %s,", strerrno()); + return -1; } } - + if (inetbind(getport()) < 0) - { return -1; - } - + /* */ { - int i; - - for (i = FCS; i < MAXCONNS + FCS; i++) - { - close(i); - } + int i; + + for (i = FCS; i < MAXCONNS + FCS; i++) + close(i); } - + #ifdef DEBUG #ifndef LOG_PERROR #define LOG_PERROR 0 @@ -576,243 +673,244 @@ int main(int argc, char * argv[]) close(2); signal(SIGHUP, SIG_IGN); #endif /* DEBUG */ - + signal(SIGPIPE, SIG_IGN); /* connection closed when writing (raises ???) */ - + writepid(nobody, nogrp); - + setegid(nogrp); setgid(nogrp); setuid(nobody); seteuid(nobody); - + { - int i; - - for (i = 0; i < 4; i++) + int i; + + for (i = 0; i < 4; i++) { - char * id = (char)NULL; - unsigned int rv = 0; - - switch (i) + const char * id = NULL; + unsigned int rv = 0; + + switch (i) { - case 0: - rv = (unsigned int)getegid(); - id = "egid"; - break; - case 1: - rv = (unsigned int)getgid(); - id = "gid"; - break; - case 2: - rv = (unsigned int)geteuid(); - id = "euid"; - break; - case 3: - rv = (unsigned int)getuid(); - id = "uid"; - break; + case 0: rv = (unsigned int)getegid(); id = "egid"; break; + case 1: rv = (unsigned int)getgid(); id = "gid"; break; + case 2: rv = (unsigned int)geteuid(); id = "euid"; break; + case 3: rv = (unsigned int)getuid(); id = "uid"; break; } - - if (rv == 0) + + if (rv == 0) { - syslog(LOG_ERR, - "Can not drop all root privileges (%s) !!! %s !!!", - id, strerrno()); - delpidfile(); - return -1; + syslog(LOG_ERR, + "Can not drop all root privileges (%s) !!! %s !!!", + id, strerrno()); + delpidfile(); + return -1; } } } - + while (2) { - fd_set rfds = G.readfds; - struct timeval tv = { 15, 0 }; - int i; - int tim = time(NULL); - - TRACE(("calling select(): n = %d, rfds = 0x%x\n\n", - G.conncnt + FCS, *(int *)&rfds)); - - select(G.conncnt + FCS, &rfds, NULL, NULL, G.conncnt? &tv: NULL); - - for (i = G.conncnt - 1; i >= 0; i--) + fd_set rfds = G.readfds; + struct timeval tv = { 15, 0 }; + int i; + int tim = time(NULL); + + TRACE(1, ("calling select(): n = %d, rfds = 0x%x\n\n", + G.conncnt + FCS, *(int *)&rfds)); + + select(G.conncnt + FCS, &rfds, NULL, NULL, G.conncnt? &tv: NULL); + + for (i = G.conncnt - 1; i >= 0; i--) { - int s = i + FCS; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909130208.x8D288C3071942>