3 files changed, 23 insertions, 21 deletions

diff --git a/usr.sbin/syslogd/syslog.conf.5 b/usr.sbin/syslogd/syslog.conf.5
index dc365a802883..f8e214d4c922 100644
--- a/usr.sbin/syslogd/syslog.conf.5
+++ b/usr.sbin/syslogd/syslog.conf.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslog.conf.5	8.1 (Berkeley) 6/9/93
-.\"	$Id: syslog.conf.5,v 1.7 1997/09/14 06:55:15 joerg Exp $
+.\"	$Id: syslog.conf.5,v 1.8 1997/10/06 20:37:50 joerg Exp $
 .\"
 .Dd June 9, 1993
 .Dt SYSLOG.CONF 5
@@ -298,9 +298,8 @@ auth.*					|exec /usr/local/sbin/authfilter
 .Sh FILES
 .Bl -tag -width /etc/syslog.conf -compact
 .It Pa /etc/syslog.conf
-The
 .Xr syslogd 8
-configuration file.
+configuration file
 .El
 .Sh BUGS
 The effects of multiple selectors are sometimes not intuitive.
diff --git a/usr.sbin/syslogd/syslogd.8 b/usr.sbin/syslogd/syslogd.8
index a1703f4ea974..f01ed97cc593 100644
--- a/usr.sbin/syslogd/syslogd.8
+++ b/usr.sbin/syslogd/syslogd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)syslogd.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: syslogd.8,v 1.11 1997/05/03 22:17:43 joerg Exp $
+.\"	$Id: syslogd.8,v 1.12 1997/09/19 22:22:03 brian Exp $
 .\"
 .Dd October 12, 1995
 .Dt SYSLOGD 8
@@ -51,12 +51,12 @@ The
 daemon reads and logs messages to the system console, log files, other
 machines and/or users as specified by its configuration file.
 The options are as follows:
-.Bl -tag -width Ds
+.Bl -tag -width indent
 .It Fl a Ar allowed_peer
 Allow
 .Ar allowed_peer
 to log to this
-.Nm syslogd
+.Nm
 using UDP datagrams.  Multiple
 .Fl a
 options may be specified.
@@ -163,16 +163,16 @@ include file
 .Sh FILES
 .Bl -tag -width /var/run/syslog.pid -compact
 .It Pa /etc/syslog.conf
-The configuration file.
+configuration file
 .It Pa /var/run/syslog.pid
-The process id of current
-.Nm Ns .
+process id of current
+.Nm
 .It Pa /var/run/log
-Name of the
+name of the
 .Tn UNIX
-domain datagram log socket.
+domain datagram log socket
 .It Pa /dev/klog
-The kernel log device.
+kernel log device
 .El
 .Sh SEE ALSO
 .Xr logger 1 ,
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index df524f6d358e..fc871d55a674 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -35,11 +35,14 @@
 static const char copyright[] =
 "@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
-/*
+#endif /* not lint */
+
+#ifndef lint
+#if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
-*/
+#endif
 static const char rcsid[] =
-	"$Id: syslogd.c,v 1.25 1997/05/03 22:17:43 joerg Exp $";
+	"$Id$";
 #endif /* not lint */
 
 /*
@@ -92,6 +95,7 @@ static const char rcsid[] =
 #include <arpa/inet.h>
 
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <regex.h>
@@ -267,7 +271,7 @@ void	printsys __P((char *));
 int	p_open __P((char *, pid_t *));
 void	reapchild __P((int));
 char   *ttymsg __P((struct iovec *, int, char *, int));
-void	usage __P((void));
+static void	usage __P((void));
 int	validate __P((struct sockaddr_in *, const char *));
 void	wallmsg __P((struct filed *, struct iovec *));
 int	waitdaemon __P((int, int, int));
@@ -464,13 +468,13 @@ main(argc, argv)
 	}
 }
 
-void
+static void
 usage()
 {
 
-	fprintf(stderr,
-		"usage: syslogd [-ds] [-a allowed_peer] [-f config_file]"
-		" [-m mark_interval]\n                [-p log_socket]\n");
+	fprintf(stderr, "%s\n%s\n",
+		"usage: syslogd [-ds] [-a allowed_peer] [-f config_file]",
+		"               [-m mark_interval] [-p log_socket]");
 	exit(1);
 }
 
@@ -705,7 +709,6 @@ fprintlog(f, flags, msg)
 	int l;
 	char line[MAXLINE + 1], repbuf[80], greetings[200];
 	char *msgret;
-	dq_t q;
 
 	v = iov;
 	if (f->f_type == F_WALL) {