From: Unknown
Date: Wed, 23 Sep 2020 11:53:26 +0100
Subject: Import old diff in quilt format

---
 CREDITS              | 12 ++++++-
 Configure            |  8 ++---
 Makefile.cfg.in      |  2 +-
 RECOMMEND            |  2 +-
 docs/cfingerd.8      |  2 +-
 docs/cfingerd.conf.5 | 12 +++----
 docs/cfingerd.text.5 |  2 +-
 perl/generic.pl      |  5 +++
 src/cfingerd.h       |  9 +++---
 src/fakeuser.c       |  6 ++--
 src/internal.c       | 10 +++---
 src/log.c            |  4 +--
 src/main.c           | 89 +++++++++++++++++++++++++++++++++++++---------------
 src/parse.c          |  4 +--
 src/proto.h          |  4 +--
 src/rfc1413.c        | 61 ++++++++++++++++++++++++++---------
 src/search.c         | 13 ++------
 src/signal.c         |  8 ++---
 src/standard.c       | 35 ++++++++++++++++-----
 src/userlist.c       | 12 +++----
 src/util.c           | 11 +++----
 src/version.c        |  2 +-
 userlist/display.c   |  4 ++-
 userlist/idle.c      | 14 ++++++---
 userlist/userlist.1  |  4 +--
 25 files changed, 220 insertions(+), 115 deletions(-)

diff --git a/CREDITS b/CREDITS
index 6a427f5..5fc7d22 100644
--- a/CREDITS
+++ b/CREDITS
@@ -48,7 +48,7 @@ Dan Hollis <root@sasami.anime.net>
 	- Shadow password testing
 	- Secure (NOBODY PATCH) finger help
 
-cc@spork.neonexus.com
+David Muench <cc@spork.neonexus.com>
 	- Finger forwarding idea
 
 Rich Salz <rsalz@uunet.net>
@@ -76,3 +76,13 @@ Tadek Knapik <tadek@nautilus.uwoj.krakow.pl>
 
 Alexey M. Zelkin <phantom@cris.net>
 	- Support for FreeBSD
+
+Kevin Rosenberg <kevin@cyberport.com>
+	- Get UTMP file entries for BSD compatibility
+
+Thomas Koenig <ig25@rz.uni-karlsruhe.de>
+	- Management of e?uid switching
+
+Lars Mathiesen <thorinn@diku.dk>
+	- ABORT code for wildmat
+
diff --git a/Configure b/Configure
index befbf91..b3fd8f9 100755
--- a/Configure
+++ b/Configure
@@ -17,10 +17,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-require 'perl/question.pl';
-require 'perl/filemagic.pl';
-require 'perl/gethost.pl';
-require 'perl/generic.pl';
+require './perl/question.pl';
+require './perl/filemagic.pl';
+require './perl/gethost.pl';
+require './perl/generic.pl';
 
 $VERSION = "1.4.2";
 $| = 1;
diff --git a/Makefile.cfg.in b/Makefile.cfg.in
index ad0b3bf..033f482 100644
--- a/Makefile.cfg.in
+++ b/Makefile.cfg.in
@@ -1,6 +1,6 @@
 # CFINGERD - Main Makefile configuration
 #
-# $Id: Makefile.cfg.in,v 1.4 1999/08/31 00:46:46 joey Exp $
+# $Id: Makefile.cfg.in,v 1.4 1999-08-31 00:46:46 joey Exp $
 #
 # Copyright (c) 1999 by Martin Schulze <joey@infodrom.north.de>
 #
diff --git a/RECOMMEND b/RECOMMEND
index bb154da..b467128 100644
--- a/RECOMMEND
+++ b/RECOMMEND
@@ -4,7 +4,7 @@ Recommended setups
 After running cfingerd for quite a while, I have found that if you make 
 the cfingerd setup the most secure, you will have the least problems.
 
-CFINGERD currently stops all files from being symbolic links, char 
+CFINGERD currently stops for all files from being symbolic links, char 
 devices, block devices, etc.  Basically, each file has to be a normal 
 file in order to be read by cfingerd.  With that in mind, you should keep 
 all files (whether or not they are read by root) as normal files.  This 
diff --git a/docs/cfingerd.8 b/docs/cfingerd.8
index e6be05a..d135968 100644
--- a/docs/cfingerd.8
+++ b/docs/cfingerd.8
@@ -33,7 +33,7 @@ options, this option is used in inetd.conf, not on the command line.
 is a totally new, and totally configurable finger daemon \- 
 one of the first.  It listenes on the finger port (port 79) to provide 
 useful information about each user that is on your system according to
-the finger protocol as described in RFC 1228.  Only thing is, cfingerd
+the finger protocol as described in RFC 1288.  Only thing is, cfingerd
 provides a unique twist.
 .PP
 .B CFINGERD
diff --git a/docs/cfingerd.conf.5 b/docs/cfingerd.conf.5
index b07388f..bafd83f 100644
--- a/docs/cfingerd.conf.5
+++ b/docs/cfingerd.conf.5
@@ -8,8 +8,8 @@ cfingerd.conf \- configurable finger daemon configuration file.
 .SH DESCRIPTION
 .I cfingerd.conf
 is the configuration file for cfingerd.
-+.I cfingerd
-+has been totally rewritten
+.B cfingerd
+has been totally rewritten
 to support a more readable configuration file.  This version of the new 
 configuration file is
 .B NOT
@@ -24,7 +24,7 @@ Each one of those sections is split into subsections, which will be
 explained next.
 .PP
 Subtext of each option is either boolean options, string options, or 
-switchable options, all changable by the system administrator.
+switchable options, all changeable by the system administrator.
 .PP
 Each section is split into a series of sections that resembles C type 
 definition; not exact, but close enough to be familiar with it.  :)  
@@ -529,7 +529,7 @@ is the string that is shown when the system gathers information from
 other sites for a user listing.
 .br
 .SH "INTERNAL STRINGS SECTION (CONFIG internal_strings)"
-These strings are changable, and can be any length you want (within 
+These strings are changeable, and can be any length you want (within 
 reason).  These strings are concattenated into the syslogging display 
 when the appropriate finger has been issued.  This section also includes 
 error messages that may occur.
@@ -607,9 +607,9 @@ matter.)  These are, instead, treated as normal scripts that can be
 called for your use.
 .PP
 The format is as follows for fake users:
-.sh
+.br
     "fake_username", "Script name", SEARCHBOOL, "script"
-.PP
+.br
 where...
 .PP
 .B fake_username
diff --git a/docs/cfingerd.text.5 b/docs/cfingerd.text.5
index 3e6fed1..67f8cdd 100644
--- a/docs/cfingerd.text.5
+++ b/docs/cfingerd.text.5
@@ -1,6 +1,6 @@
 .TH CFINGERD.TEXT 5 "7 Aug 1999" "1.4.2" "Configurable Finger Daemon"
 .SH NAME
-cfingerd text rules
+cfingerd.text \- cfingerd text rules
 .br
 .SH "EXPLANATION"
 .B cfingerd
diff --git a/perl/generic.pl b/perl/generic.pl
index b5e5d47..4d4f55a 100644
--- a/perl/generic.pl
+++ b/perl/generic.pl
@@ -14,6 +14,11 @@ sub get_os {
 	chop($uname);
 	$uname =~ tr/a-z/A-Z/;
 
+	# Tiny hack to make GNU/kFreeBSD and GNU/Hurd act as GNU/Linux
+	if (($uname eq 'GNU/KFREEBSD') || ($uname eq 'GNU')) {
+	    $uname = 'LINUX';
+	}
+
 	$ver = `uname -r`;
 	chop($ver);
 
diff --git a/src/cfingerd.h b/src/cfingerd.h
index 9bc5713..97ba635 100644
--- a/src/cfingerd.h
+++ b/src/cfingerd.h
@@ -278,10 +278,11 @@ typedef struct ecruft {
 
 extern CONFIG prog_config;
 extern ECRUFT errors[];
-extern char *remote_addr, *localhost, *ident_user, *ip_address;
+extern char remote_addr[], ip_address[];
+extern char *localhost, *ident_user;
 extern int trusted_host_num, rejected_host_num, forward_host_num,
-	   fakeuser_num, num_finger_sites, num_headers, local_port,
-	   remote_port, can_log;
+	   fakeuser_num, num_finger_sites, num_headers, can_log;
+extern unsigned short local_port, remote_port;
 extern FILE *top_display, *bottom_display, *noname_display, *nouser_display,
 	    *rejected_display, *identd_display;
 extern BOOL local_finger, emulated;
@@ -293,4 +294,4 @@ extern unsigned long listen_addr;
 
 #include "defines.h"
 
-#endif _CFINGERD_H_
+#endif /* _CFINGERD_H_ */
diff --git a/src/fakeuser.c b/src/fakeuser.c
index 44be960..80c83c1 100644
--- a/src/fakeuser.c
+++ b/src/fakeuser.c
@@ -79,7 +79,7 @@ void handle_fakeuser(char *username)
 	    printf("\n                    Sorry, you specified too many options.\n\n");
 	    fflush(stdout);
 	    show_bottom();
-	    log(LOG_WARN, "Too many options specified in fake user finger", NULL);
+	    mylog(LOG_WARN, "Too many options specified in fake user finger", NULL);
 	    return;
  	}
 
@@ -105,7 +105,7 @@ void handle_fakeuser(char *username)
 	    sscanf(username, "%[^.].%[^.].%[^.].%[^.].%[^\r\n]\r\n",
 		data[0], data[1], data[2], data[3], data[4]);
 
-	log(LOG_USER, "Fakeuser: ", username);
+	mylog(LOG_USER, "Fakeuser: ", username);
 
 	funum = search_fake_pos(data[0]);
 
@@ -133,7 +133,7 @@ void handle_fakeuser(char *username)
     } else {
 	printf("\n");
 	printf("             Sorry, this system does not have any fake users enabled!\n\n");
-	log(LOG_WARN, "Fake user requested, but rejected - disabled.", " ");
+	mylog(LOG_WARN, "Fake user requested, but rejected - disabled.", " ");
     }
 
     show_bottom();
diff --git a/src/internal.c b/src/internal.c
index 1a5d4aa..9056e5e 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -72,26 +72,26 @@ void handle_internal(char *username)
     else if (!strncmp(username, "services", 8)) {
 	show_services();
 	syslog(LOG_NOTICE, "%s", prog_config.p_strings[D_SVC_FINGER]);
-	log(LOG_USER, "Service request", " ");
+	mylog(LOG_USER, "Service request", " ");
 	exit(PROGRAM_OKAY);
     } else if (!strncmp(username, "search", 6)) {
 	show_search(username);
 	exit(PROGRAM_OKAY);
     } else if (!strncmp(username, "userlist-only", 13)) {
-	if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, "/usr/sbin/userlist | /usr/bin/tail +2")) != NULL) {
+	if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, "/usr/sbin/userlist | /usr/bin/tail -n +2")) != NULL) {
 	    printf ("%s", buf);
 	    fflush(stdout);
 	    free (buf);
 	}
-	log(LOG_USER, "Userlist-only", " ");
+	mylog(LOG_USER, "Userlist-only", " ");
 	exit(PROGRAM_OKAY);
     } else if (!strncmp(username, "userlist-online", 15)) {
-	if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, "/usr/sbin/userlist -c -n | /usr/bin/tail +2")) != NULL) {
+	if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, "/usr/sbin/userlist -c -n | /usr/bin/tail -n +2")) != NULL) {
 	    printf ("%s", buf);
 	    fflush(stdout);
 	    free (buf);
 	}
-	log(LOG_USER, "Userlist-only", " ");
+	mylog(LOG_USER, "Userlist-only", " ");
 	exit(PROGRAM_OKAY);
     } else if (!strncmp(username, "help", 4)) {
 	show_top();
diff --git a/src/log.c b/src/log.c
index 7939c7d..b397d20 100644
--- a/src/log.c
+++ b/src/log.c
@@ -17,7 +17,7 @@
 #include "proto.h"
 #include "privs.h"
 
-void log(int logtype, char *msg, char *user)
+void mylog(int logtype, char *msg, char *user)
 {
     if (can_log && (prog_config.config_bits3 & SHOW_LOG)) {
 	time_t tim = time(NULL);
@@ -80,7 +80,7 @@ void userlog(uid_t uid, gid_t gid, char *dir, char *user)
     } else {
 	if (!(prog_config.config_bits3 & SHOW_CREATE_FLG)) {
 	    syslog(LOG_WARNING, "Userlog: %s (%s)", filename, strerror(errno));
-	    log(LOG_ERROR, "Cannot write to userlog: ", strerror(errno));
+	    mylog(LOG_ERROR, "Cannot write to userlog: ", strerror(errno));
 	}
     }
 }
diff --git a/src/main.c b/src/main.c
index f6a7a71..d300e8c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,11 +20,13 @@
 #include "privs.h"
 
 CONFIG prog_config;
-char *remote_addr, *localhost, *ident_user, *ip_address;
+char *localhost, *ident_user;
+char ip_address[INET6_ADDRSTRLEN] = "";
+char remote_addr[INET6_ADDRSTRLEN] = "";
 FILE *top_display, *bottom_display, *noname_display, *nouser_display,
      *rejected_display, *identd_display;
 BOOL local_finger, emulated; 
-int local_port, remote_port;
+unsigned short local_port, remote_port;
 unsigned short listen_port;
 unsigned long listen_addr;
 
@@ -62,14 +64,15 @@ int main(int argc, char *argv[])
     char line[100], username[80], syslog_str[200];
     int un_type;
     char *cp;
-    struct sockaddr_in local_addr;
+    struct sockaddr_storage local_addr;
+    struct sockaddr_in *sloc4 = (struct sockaddr_in *) &local_addr;
+    struct sockaddr_in6 *sloc6 = (struct sockaddr_in6 *) &local_addr;
     struct servent *serv;
 
     if ((serv = getservbyname("finger","tcp")) != NULL)
 	listen_port = serv->s_port;
     else
 	listen_port = htons(79);
-    listen_addr = htonl(INADDR_ANY);
 
     /* Initialize CFINGERD */
     start_handler();
@@ -108,12 +111,12 @@ int main(int argc, char *argv[])
     /* Make sure there is actually data waiting in the finger port */
     if (!emulated) {
 	if (!fgets(username, sizeof(username), stdin)) {
-	  if (remote_addr != NULL) {
+	  if (remote_addr != NULL && *remote_addr) {
 	    syslog(LOG_ERR, "Null query from %s: %m", remote_addr);
-	    log(LOG_ERROR, remote_addr, strerror(errno));
+	    mylog(LOG_ERROR, remote_addr, strerror(errno));
 	  } else {
 	    syslog(LOG_ERR, "Null query: %m");
-	    log(LOG_ERROR, strerror(errno), strerror(0));
+	    mylog(LOG_ERROR, strerror(errno), strerror(0));
 	  }
 	    closelog();
 	    exit(PROGRAM_SYSLOG);
@@ -147,33 +150,64 @@ int main(int argc, char *argv[])
     /* If we're not doing emulated stuff, we can assume that we are running
        either as a daemon, or under INETD.  In that case... */
     if (!emulated) {
-	struct sockaddr_in socket_addr;
+	struct sockaddr_storage socket_addr;
+	struct sockaddr_in *srem4 = (struct sockaddr_in *) &socket_addr;
+	struct sockaddr_in6 *srem6 = (struct sockaddr_in6 *) &socket_addr;
 	struct hostent *host_ent;
-	int psize = 0;
+	socklen_t locsize = 0, remsize = 0;
 
 	/* Can't run from command line (but this should already be checked) */
-	psize = sizeof(socket_addr);
+	locsize = sizeof(local_addr);
 
-	if (getsockname(0, (struct sockaddr *) &local_addr, &psize)) {
+	if (getsockname(0, (struct sockaddr *) &local_addr, &locsize)) {
 	    syslog(LOG_WARNING, "getsockname: %s", strerror(errno));
 	    local_port = 0;
 	} else
-	    local_port = ntohs(local_addr.sin_port);
+	    switch (local_addr.ss_family) {
+		case AF_INET6:
+		    local_port = ntohs(sloc6->sin6_port);
+		    break;
+		case AF_INET:
+		default:
+		    local_port = ntohs(sloc4->sin_port);
+	    }
+
+	remsize = sizeof(socket_addr);
 
-	if (getpeername(0, (struct sockaddr *) &socket_addr, &psize)) {
+	if (getpeername(0, (struct sockaddr *) &socket_addr, &remsize)) {
 	    printf("Internal error - not running as either a daemon or under INETD.\n");
 	    printf("Fatal - getpeername: %s\n", strerror(errno));
 	    closelog();
-	    log(LOG_ERROR, "getpeername: ", strerror(errno));
+	    mylog(LOG_ERROR, "getpeername: ", strerror(errno));
 	    exit(PROGRAM_BUG);
 	} else
-	    remote_port = ntohs(socket_addr.sin_port);
+	    switch (socket_addr.ss_family) {
+		case AF_INET6:
+		    remote_port = ntohs(srem6->sin6_port);
+		    break;
+		case AF_INET:
+		default:
+		    remote_port = ntohs(srem4->sin_port);
+	    }
 
-	ip_address = inet_ntoa (socket_addr.sin_addr);
+	inet_ntop(socket_addr.ss_family, &socket_addr,
+			ip_address, INET6_ADDRSTRLEN);
 
 	/* Get our host entry */
-	host_ent = (struct hostent *) gethostbyaddr((char *) &socket_addr.sin_addr,
-		   sizeof(socket_addr.sin_addr), AF_INET);
+	switch (socket_addr.ss_family) {
+	    case AF_INET6:
+		host_ent = (struct hostent *)
+				gethostbyaddr((char *) &srem6->sin6_addr,
+					sizeof(struct in6_addr),
+					socket_addr.ss_family);
+		break;
+	    case AF_INET:
+	    default:
+		host_ent = (struct hostent *)
+				gethostbyaddr((char *) &srem4->sin_addr,
+					sizeof(struct in_addr),
+					socket_addr.ss_family);
+	}
 
 	/* And get our local-host name */
 #ifndef	ACTUAL_HOSTNAME
@@ -184,14 +218,14 @@ int main(int argc, char *argv[])
 
 	/* Make sure we can get the remote host's address name */
 	if (host_ent == NULL) {
-	    remote_addr = inettos(socket_addr.sin_addr.s_addr);
+	    strncpy(remote_addr, ip_address, INET6_ADDRSTRLEN);
 	    syslog(LOG_WARNING, "%s %s", 
 		prog_config.p_strings[D_IP_NO_MATCH],
 		remote_addr);
 	    if (!(prog_config.config_bits2 & SHOW_IP_MATCH))
 		CF_ERROR(E_NOIP);
 	} else
-	    remote_addr = (char *) host_ent->h_name;
+	    strncpy(remote_addr, host_ent->h_name, INET6_ADDRSTRLEN);
 
 	/* Convert any uppercase letters in the hostname to lowercase */
 	for (cp = remote_addr; *cp; cp++)
@@ -200,14 +234,17 @@ int main(int argc, char *argv[])
 
 	/* And find out if this is a local finger */
 	if (!strncasecmp(remote_addr, "127.0.0.1", 9) ||
+	    !strncasecmp(remote_addr, "::1", 3) ||
 	    !strncasecmp(remote_addr, "localhost", 9) ||
+	    !strncasecmp(remote_addr, "ip6-localhost", 9) ||
+	    !strncasecmp(remote_addr, "ip6-loopback", 9) ||
 	    !strncasecmp(remote_addr, "127.0.0.0", 9) || /* KTH 07/26/96 */
 	    !strncasecmp(remote_addr, localhost, strlen(localhost)))
 	    local_finger = TRUE;
 	else
 	    local_finger = FALSE;
 
-	ident_user = get_rfc1413_data(local_addr);
+	ident_user = get_rfc1413_data(&local_addr, &socket_addr);
 	set_time_format();
 
     } else
@@ -220,9 +257,9 @@ int main(int argc, char *argv[])
 	memset (ident_user, 0, sizeof (ident_user));
 	strcpy (ident_user, "emulated");
 #ifndef	ACTUAL_LOOPBACK
-	remote_addr = "127.0.0.1";
+	strcpy(remote_addr,"127.0.0.1");
 #else
-	remote_addr = ACTUAL_LOOPBACK;
+	strcpy(remote_addr, ACTUAL_LOOPBACK);
 #endif
     }
 
@@ -242,7 +279,7 @@ int main(int argc, char *argv[])
 	    if (!emulated) {
 		snprintf(syslog_str, sizeof(syslog_str), "%s fingered (internal) from %s", username,
 		    ident_user);
-		syslog(LOG_NOTICE, (char *) syslog_str);
+		syslog(LOG_NOTICE, "%s", (char *) syslog_str);
 	    }
 
 	    handle_internal(username);
@@ -255,7 +292,7 @@ int main(int argc, char *argv[])
 		    snprintf(syslog_str, sizeof(syslog_str), "%s fingered from %s",
 			prog_config.p_strings[D_ROOT_FINGER], ident_user);
 
-		syslog(LOG_NOTICE, (char *) syslog_str);
+		syslog(LOG_NOTICE, "%s", (char *) syslog_str);
 	    }
 
 	    handle_standard(username);
@@ -265,7 +302,7 @@ int main(int argc, char *argv[])
 		snprintf(syslog_str, sizeof(syslog_str), "%s %s from %s", username, 
 		    prog_config.p_strings[D_FAKE_USER], ident_user);
 
-		syslog(LOG_NOTICE, (char *) syslog_str);
+		syslog(LOG_NOTICE, "%s", (char *) syslog_str);
 	    }
 
 	    handle_fakeuser(username);
diff --git a/src/parse.c b/src/parse.c
index 9c7ad87..96a3abc 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -137,14 +137,14 @@ int process_username(char *username)
 	if (ret == U_FORWARD) {
 	    printf("%s\n", prog_config.p_strings[D_FORWARD_DENY]);
 	    fflush(stdout);
-	    log(LOG_USER, "Denied forward: ", username);
+	    mylog(LOG_USER, "Denied forward: ", username);
 	    exit(1);
 	}
 
 	if (ret == U_ILLEGAL) {
 	    printf("Illegal character in username.\n");
 	    fflush(stdout);
-	    log(LOG_USER, "Illegal: ", username);
+	    mylog(LOG_USER, "Illegal: ", username);
 	    exit(1);
 	}
 
diff --git a/src/proto.h b/src/proto.h
index 9d48c99..789b21f 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -45,9 +45,9 @@ void show_search(char *);
 void become_nobody(void);
 void become_user(char *);
 int wildmat(char *, char *);
-char *get_rfc1413_data(struct sockaddr_in );
+char *get_rfc1413_data(struct sockaddr_storage *, struct sockaddr_storage *);
 void check_unknown(char *);
-void log(int, char *, char *);
+void mylog(int, char *, char *);
 void userlog(uid_t, gid_t, char *, char *);
 void check_blank_configurations(void);
 int search_fake_pos(char *);
diff --git a/src/rfc1413.c b/src/rfc1413.c
index 05a395a..8ee02de 100644
--- a/src/rfc1413.c
+++ b/src/rfc1413.c
@@ -25,45 +25,75 @@ void rfc1413_alarm(int signal)
  * the implementation.  Completely rewritten by yours truly to be self-
  * contained in a single program.  Simple, easy to use.
  */
-#define BUFLEN	256
-char *get_rfc1413_data( struct sockaddr_in local_addr )
+#define UNAMELEN   64
+#define BUFLEN     UNAMELEN + INET6_ADDRSTRLEN + 2
+#define INPUTLEN   256
+char *get_rfc1413_data(struct sockaddr_storage * local_addr,
+			struct sockaddr_storage * peer_addr )
 {
     int i, j;
-    struct sockaddr_in sin;
-    char buffer[1024], buf[BUFLEN], uname[64], *bleah;
+    unsigned short newport;
+    struct sockaddr_storage sin;
+    struct sockaddr_in *sa4 = (struct sockaddr_in *) &sin;
+    struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &sin;
+    char buffer[1024], buf[INPUTLEN], uname[UNAMELEN], *bleah;
     char *cp, *xp;
     struct servent *serv;
 
     bleah = (char *) malloc(BUFLEN);
     memset(bleah, 0, BUFLEN);
 
-    j = socket(AF_INET, SOCK_STREAM, 0);
+    j = socket(local_addr->ss_family, SOCK_STREAM, 0);
     if (j < 2) {
 	snprintf(bleah, BUFLEN, "unknown@%s", remote_addr);
 	syslog(LOG_ERR, "rfc1413-socket: %s", strerror(errno));
 	return(bleah);
     }
 
-    sin.sin_family = AF_INET;
-    sin.sin_addr.s_addr = local_addr.sin_addr.s_addr;
-    sin.sin_port = 0;
-    i = bind(j, (struct sockaddr *) &sin, sizeof(sin));
+    memcpy(&sin, local_addr, sizeof(sin));
+    switch (sin.ss_family) {
+	case AF_INET6:
+	    sa6->sin6_port = 0;
+	    break;
+	case AF_INET:
+	default:
+	    sa4->sin_port = 0;
+    }
+
+    i = bind(j, (struct sockaddr *) &sin, 
+		    (sin.ss_family == AF_INET6 )
+			? sizeof(struct sockaddr_in6)
+			: sizeof(struct sockaddr_in));
+
     if (i < 0) {
 	snprintf(bleah, BUFLEN, "unknown@%s", remote_addr);
 	syslog(LOG_ERR, "rfc1413-socket: %s", strerror(errno));
 	return(bleah);
     }
 
-    sin.sin_family = AF_INET;
     if ((serv = getservbyname("auth","tcp")) != NULL)
-	sin.sin_port = serv->s_port;
+	newport = serv->s_port;
     else
-	sin.sin_port = htons(113);
-    sin.sin_addr.s_addr = inet_addr(ip_address);
+	newport = htons(113);
+
+    memcpy(&sin, peer_addr, sizeof(sin));
+    switch (sin.ss_family) {
+	case AF_INET6:
+	    sa6->sin6_port = newport;
+	    break;
+	case AF_INET:
+	default:
+	    sa4->sin_port = newport;
+    }
+
     signal(SIGALRM, rfc1413_alarm);
     alarm(5);
 
-    i = connect(j, (struct sockaddr *) &sin, sizeof(sin));
+    i = connect(j, (struct sockaddr *) &sin,
+		    (sin.ss_family == AF_INET6 )
+			? sizeof(struct sockaddr_in6)
+			: sizeof(struct sockaddr_in));
+
     if (i < 0) {
 	syslog(LOG_ERR, "rfc1413-connect: %s", strerror(errno));
 	close(j);
@@ -98,7 +128,8 @@ char *get_rfc1413_data( struct sockaddr_in local_addr )
 
 	if (*(++cp) == ' ') cp++;
 	memset(uname, 0, sizeof(uname));
-	for (xp=uname; *cp != '\0' && *cp!='\r'&&*cp!='\n'&&strlen(uname)<sizeof(uname); cp++)
+	for (xp=uname; *cp != '\0' && *cp!='\r'&&*cp!='\r'&&*cp!='\n'&&(strlen(uname)+1)<sizeof(uname); cp++)
+
 	    *(xp++) = *cp;
 
 	if (!strlen(uname)) {
diff --git a/src/search.c b/src/search.c
index 3523517..de1d950 100644
--- a/src/search.c
+++ b/src/search.c
@@ -36,7 +36,7 @@ void show_search(char *uname)
     SEARCHLIST searches[MAX_SEARCHES];
     FILE *file;
     char *cp;
-    char *xp, y;
+    char *xp;
 
     show_top();
 
@@ -56,13 +56,6 @@ void show_search(char *uname)
 	exit(PROGRAM_OKAY);
     }
 
-    for (cp=searchname,xp=searchname,y=0;*cp;cp++) {
-	if (y != *cp)
-	    *(xp++) = *cp;
-	y = *cp;
-    }
-    *xp = '\0';
-	
     if (strlen((char *) searchname) == 0) {
 	printf("\n                    You must supply a name to search for!\n");
 	SEND_RAW_RETURN;
@@ -75,7 +68,7 @@ void show_search(char *uname)
 	printf("\n                    You must supply a name to search for!\n");
 	SEND_RAW_RETURN;
 	show_bottom();
-	log(LOG_USER, "Security breach: finger * from %s", ident_user);
+	mylog(LOG_USER, "Security breach: finger * from %s", ident_user);
 	syslog(LOG_WARNING, "Security breach: finger * from %s", ident_user);
 	free (searchname);
 	exit(PROGRAM_OKAY);
@@ -85,7 +78,7 @@ void show_search(char *uname)
       if (isupper(*cp))
 	*cp = tolower(*cp);
 
-    log(LOG_USER, "Search: ", searchname);
+    mylog(LOG_USER, "Search: ", searchname);
 
     NOBODY_PRIVS;
 
diff --git a/src/signal.c b/src/signal.c
index 162952d..23d366c 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -81,7 +81,7 @@ void int_handler(int signo)
 
 	    if (siglist[i].fatal) {
 		printf("\nPlease report this bug to %s!\n", ERRORS_TO);
-		log(LOG_ERROR, "Signal (fatal): ", siglist[i].sigtype);
+		mylog(LOG_ERROR, "Signal (fatal): ", siglist[i].sigtype);
 	    } else {
 		if (siglist[i].value == SIGALRM) {
 		    printf("Ooh, you caught an alarm signal.  This may be a cause from either not\n");
@@ -89,7 +89,7 @@ void int_handler(int signo)
 		    printf("out on you.  May want to check this.  :)\n\n");
 		}
 
-		log(LOG_WARN, "Signal: Alarm signal", " ");
+		mylog(LOG_WARN, "Signal: Alarm signal", " ");
 
 		printf("Non-fatal; continuing.\n");
 	    }
@@ -99,7 +99,7 @@ void int_handler(int signo)
 	    if (siglist[i].fatal)
 		exit(PROGRAM_BUG);
 	    else
-		log(LOG_WARN, "Signal (non-fatal): ", siglist[i].sigtype);
+		mylog(LOG_WARN, "Signal (non-fatal): ", siglist[i].sigtype);
 	}
     }
 
@@ -109,7 +109,7 @@ void int_handler(int signo)
 	syslog(LOG_ERR, "SIGUNKNOWN caught");
 	(void) fflush(stdout);
 
-	log(LOG_ERROR, "Signal: Unknown signal", " ");
+	mylog(LOG_ERROR, "Signal: Unknown signal", " ");
 
 	exit(PROGRAM_BUG);
     }
diff --git a/src/standard.c b/src/standard.c
index 655c1e3..b4ba433 100644
--- a/src/standard.c
+++ b/src/standard.c
@@ -155,6 +155,7 @@ void show_pfile(uid_t uid, gid_t gid, int t1, int t2, int t3, char *dir, char *d
 	    fflush(stdout);
 	}
 
+	USER_PRIVS(uid, gid);
 	if (exist(d)) {
 	    NOBODY_PRIVS;
 
@@ -163,9 +164,14 @@ void show_pfile(uid_t uid, gid_t gid, int t1, int t2, int t3, char *dir, char *d
 		fflush(stdout);
 	    }
 
+	    USER_PRIVS(uid, gid);
 	    if ((file = open_file(d)) != NULL)
+	    {
+		NOBODY_PRIVS;
 		display_file(uid, gid, file);
+           }
 	} else {
+	    NOBODY_PRIVS;
 	    if (!(prog_config.config_bits3 & SHOW_HEADERS_FE))
 		printf("%s\n", prog_config.p_strings[t3]);
 	    else
@@ -206,6 +212,7 @@ void show_pfile2(uid_t uid, gid_t gid, int t1, int t2, int t3, char *dir, char *
 	    fflush(stdout);
 	}
 
+	USER_PRIVS(uid, gid);
 	if (exist(d)) {
 	    NOBODY_PRIVS;
 
@@ -214,9 +221,13 @@ void show_pfile2(uid_t uid, gid_t gid, int t1, int t2, int t3, char *dir, char *
 		fflush(stdout);
 	    }
 
-	    if ((open_file (d)) != NULL)
+	    USER_PRIVS(uid, gid);
+	    if ((file = open_file (d)) != NULL) {
+		NOBODY_PRIVS;
 		display_file(uid, gid, file);
+           }
 	} else {
+	    NOBODY_PRIVS;
 	    if (!(prog_config.config_bits3 & SHOW_HEADERS_FE))
 		printf("%s\n", prog_config.p_strings[t3]);
 	}
@@ -376,11 +387,21 @@ void show_idle(char *tty)
     sprintf(dev_file, "/dev/%s", tty);
 
     USER_PRIVS(nuid, ngid);
-    stat((char *) dev_file, &buf);
+    if (stat((char *) dev_file, &buf) != 0) {
+	NOBODY_PRIVS;
+	return;
+    }
     NOBODY_PRIVS;
 
+    if (!buf.st_atime || !buf.st_mtime)
+	return;
+
     cur_time = time(NULL);
-    diff_time = (long) cur_time - (long) buf.st_mtime;
+    diff_time = buf.st_mtime < buf.st_atime
+		? (long) cur_time - (long) buf.st_mtime
+		: (long) cur_time - (long) buf.st_atime;
+    if (diff_time < 0)
+	diff_time = 0;
 
     sec = min = hour = day = has = 0;
 
@@ -394,7 +415,7 @@ void show_idle(char *tty)
 	sec = has = 1;
 
     if (has)
-	printf(" Idle ");
+	printf(" idle ");
 
     if (day) {
 	day = diff_time / 86400;
@@ -1002,21 +1023,21 @@ void handle_standard(char *username)
 		memset(uname, 0, 600);
 		printf("\nChecking site %s for the specified user.\n", prog_config.forward[nums]);
 		fflush(stdout);
-		snprintf(uname, sizeof(uname), "/usr/bin/finger \"%s\100%s\" | /usr/bin/tail +2", username, prog_config.forward[nums]);
+		snprintf(uname, sizeof(uname), "/usr/bin/finger \"%s\100%s\" | /usr/bin/tail -n +2", username, prog_config.forward[nums]);
 		if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, uname)) != NULL) {
 		    printf ("%s", buf);
 		    fflush(stdout);
 		    free (buf);
 		}
 		nums++;
-		log(LOG_USER, "Forwarded: ", username);
+		mylog(LOG_USER, "Forwarded: ", username);
 	    }
 	} else {
 	    show_notexist();
 	}
     } else {
 	show_fingerinfo(username);
-	log(LOG_USER, "Normal: ", username);
+	mylog(LOG_USER, "Normal: ", username);
     }
 
     if ((!(prog_config.config_bits2 & SHOW_FINGERFWD)) || 
diff --git a/src/userlist.c b/src/userlist.c
index 8058b0e..c049925 100644
--- a/src/userlist.c
+++ b/src/userlist.c
@@ -56,10 +56,10 @@ void handle_userlist(char *username)
 
 		    if (!strcmp (username, "userlist"))
 			snprintf(cmdline, sizeof (cmdline),
-				 "%s -n | /usr/bin/tail +2", prog_config.finger_program);
+				 "%s -n | /usr/bin/tail -n +2", prog_config.finger_program);
 		    else
 			snprintf(cmdline, sizeof (cmdline),
-				 "%s | /usr/bin/tail +2", prog_config.finger_program);
+				 "%s | /usr/bin/tail -n +2", prog_config.finger_program);
 
 		    if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, cmdline)) != NULL) {
 			if (!head) {
@@ -72,10 +72,10 @@ void handle_userlist(char *username)
 		    }
 		} else {
 		    if (!strcmp (username, "userlist"))
-			snprintf(cmdline, sizeof(cmdline), "/usr/bin/finger userlist-online@%s | tail +2 | grep -v '^$'",
+			snprintf(cmdline, sizeof(cmdline), "/usr/bin/finger userlist-online@%s | tail -n +2 | grep -v '^$'",
 				 prog_config.finger_sites[i]);
 		    else
-			snprintf(cmdline, sizeof(cmdline), "/usr/bin/finger userlist-only@%s | tail +2 | grep -v '^$'",
+			snprintf(cmdline, sizeof(cmdline), "/usr/bin/finger userlist-only@%s | tail -n +2 | grep -v '^$'",
 				 prog_config.finger_sites[i]);
 
 		    if ((buf = safe_exec(NOBODY_UID, NOBODY_GID, cmdline)) != NULL) {
@@ -92,7 +92,7 @@ void handle_userlist(char *username)
 	} else {
 	    if ((!strstr(prog_config.finger_program, "finger")) &&
 		(!strstr(prog_config.finger_program, "w")))
-		snprintf(cmdline, sizeof(cmdline), "%s | /usr/bin/tail +2", prog_config.finger_program);
+		snprintf(cmdline, sizeof(cmdline), "%s | /usr/bin/tail -n +2", prog_config.finger_program);
 	    else 
 		snprintf(cmdline, sizeof(cmdline), "%s", prog_config.finger_program);
 
@@ -144,7 +144,7 @@ void handle_userlist(char *username)
 
     show_bottom();
 
-    log(LOG_USER, "Userlist request", " ");
+    mylog(LOG_USER, "Userlist request", " ");
 }
 
 /*
diff --git a/src/util.c b/src/util.c
index 770ad0a..76a1819 100644
--- a/src/util.c
+++ b/src/util.c
@@ -178,7 +178,7 @@ void parse_line(uid_t uid, gid_t gid, char *line)
 
 	    pos++;
 
-	    while((line[pos] != ' ') && (!done)) {
+	    while (line[pos] != ' ' && !done && newpos < 80) {
 		command[newpos] = line[pos];
 
 		if (line[pos] == ' ')
@@ -298,7 +298,7 @@ void parse_line(uid_t uid, gid_t gid, char *line)
 	    for(x = 0; x < center_dist; x++)
 		printf(" ");
 
-	printf(displine);
+	printf("%s", displine);
 
 	free(displine);
     }
@@ -465,7 +465,7 @@ char *get_localhost(void)
     ret = (char *) malloc(strlen((char *) hostname) +
 			  strlen((char *) domname) + 2);
 
-    snprintf(ret, sizeof(ret), "%s.%s", (char *) hostname, (char *) domname);
+    sprintf(ret, "%s.%s", (char *) hostname, (char *) domname);
     return(ret);
 }
 
@@ -483,7 +483,7 @@ void check_unknown(char *host)
 	    host, prog_config.p_strings[D_REJECT_HOST]);
 	if (prog_config.config_bits2 & SHOW_REJECTED)
 	    display_file(NOBODY_UID, NOBODY_GID, rejected_display);
-	log(LOG_IDENT, "Unknown not allowed from ", host);
+	mylog(LOG_IDENT, "Unknown not allowed from ", host);
 
 	exit(PROGRAM_OKAY);
     }
@@ -537,7 +537,7 @@ void check_rejected(char *host)
 	    if (prog_config.config_bits2 & SHOW_REJECTED)
 		display_file(NOBODY_UID, NOBODY_GID, rejected_display);
 
-	    log(LOG_REJECTED, "Rejected host finger detected to ", host);
+	    mylog(LOG_REJECTED, "Rejected host finger detected to ", host);
 
 	    exit(PROGRAM_OKAY);
 	}
@@ -588,7 +588,6 @@ char *safe_exec (uid_t uid, gid_t gid, char *cmd)
 	memset (line, 0, 600);
 	while ((read (fd[0], line, sizeof (line)-1)) > 0) {
 	    if ((size += strlen (line)) < MAX_POPEN_BUF) {
-		syslog (LOG_INFO, "Reallocating %d bytes", size);
 		if ((result = (char *) realloc (result, size+1)) == NULL) {
 		    return NULL;
 		}
diff --git a/src/version.c b/src/version.c
index 1a1c8a9..30e757c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -45,7 +45,7 @@ void show_version_info(void)
     printf("The last stable version of CFINGERD is %s\n\n", LAST_STABLE_RELEASE);
 #endif
 
-    log(LOG_USER, "Version information", " ");
+    mylog(LOG_USER, "Version information", " ");
 
     fflush(stdout);
     exit(PROGRAM_OKAY);
diff --git a/userlist/display.c b/userlist/display.c
index 5907dff..3c0a97c 100644
--- a/userlist/display.c
+++ b/userlist/display.c
@@ -79,7 +79,7 @@ void process_display(void)
 
 	if (strlen((char *) tty_list[i].username) > 1) {
 	    char *username=NULL;
-	    char ru[8], fn[STRLEN];
+	    char ru[9], fn[STRLEN];
 
 	    memset(ru, 0, sizeof (ru));
 	    memset(fn, 0, sizeof (fn));
@@ -89,6 +89,8 @@ void process_display(void)
 	    pwent = getpwnam((char *) ru);
 
 	    if (pwent) {
+		char *cp, *x;
+
 		cp = pwent->pw_gecos;
 		if ((x = index (pwent->pw_gecos, ',')) != NULL) /* username */
 		    *x = '\0';
diff --git a/userlist/idle.c b/userlist/idle.c
index 829dea7..cec0c5f 100644
--- a/userlist/idle.c
+++ b/userlist/idle.c
@@ -24,10 +24,16 @@ char *calc_idle(char *tty)
 
     snprintf(dev_file, sizeof (dev_file), "/dev/%s", tty);
 
-    stat((char *) dev_file, &buf);
+    if (stat((char *) dev_file, &buf) != 0 || !buf.st_atime || !buf.st_mtime) {
+	sprintf(idledisp, "-");
+	return idledisp;
+    }
     cur_time = time(NULL);
-
-    diff_time = (long) cur_time - (long) buf.st_mtime;
+    diff_time = buf.st_mtime < buf.st_atime
+		? (long) cur_time - (long) buf.st_mtime
+		: (long) cur_time - (long) buf.st_atime;
+    if (diff_time < 0)
+	diff_time = 0;
 
     min = hour = day = 0;
 
@@ -45,7 +51,7 @@ char *calc_idle(char *tty)
 
     if (day) {
 	if (no_idle) return NULL;
-	snprintf(idledisp, sizeof (idledisp), "%1dd ", day);
+	snprintf(idledisp, sizeof (idledisp), "%1dd", day);
 	return idledisp;
     }
 
diff --git a/userlist/userlist.1 b/userlist/userlist.1
index 35c9b6f..a50a29f 100644
--- a/userlist/userlist.1
+++ b/userlist/userlist.1
@@ -8,7 +8,7 @@ userlist \- Userlisting of who's on your system.
 .SH DESCRIPTION
 This program simply gives you a listing of who is connected to your 
 system.  It is used primarily in the sorted listing of
-.Br cfingerd ,
+.BR cfingerd ,
 which 
 utilitizes the same method of display for a more uniform output between 
 systems.  (It also made more sense to do it this way instead of having 
@@ -40,7 +40,7 @@ it checks getpwnam, anyway.  :)
 .B "\-c"
 Give standard CFINGERD (custom) output.
 .TP
-.B. "\-n"
+.B "\-n"
 List only people idle less than one day.
 .br
 .SH ADDITIONAL