install correct aliases file
[unix-history] / usr / src / usr.sbin / syslogd / syslogd.c
index 1e49045..5211cfd 100644 (file)
+/*
+ * Copyright (c) 1983, 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1983, 1988 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
 #ifndef lint
 #ifndef lint
-static char sccsid[] = "@(#)syslogd.c  4.5 (Berkeley) %G%";
-#endif
+static char sccsid[] = "@(#)syslogd.c  5.27 (Berkeley) %G%";
+#endif /* not lint */
 
 /*
  *  syslogd -- log system messages
  *
  * This program implements a system log. It takes a series of lines.
  * Each line may have a priority, signified as "<n>" as
 
 /*
  *  syslogd -- log system messages
  *
  * This program implements a system log. It takes a series of lines.
  * Each line may have a priority, signified as "<n>" as
- * the first three characters of the line.  If this is
- * not present, a default priority (DefPri) is used, which
- * starts out as LOG_NOTICE.  The default priority can get
- * changed using "<*>n".
+ * the first characters of the line.  If this is
+ * not present, a default priority is used.
  *
  * To kill syslogd, send a signal 15 (terminate).  A signal 1 (hup) will
  * cause it to reread its configuration file.
  *
  * Defined Constants:
  *
  *
  * To kill syslogd, send a signal 15 (terminate).  A signal 1 (hup) will
  * cause it to reread its configuration file.
  *
  * Defined Constants:
  *
- * DAEMON -- Userid number to setuid to after setup.
  * MAXLINE -- the maximimum line length that can be handled.
  * MAXLINE -- the maximimum line length that can be handled.
- * NLOGS -- the maximum number of simultaneous log files.
- * NUSERS -- the maximum number of people that can
- *     be designated as "superusers" on your system.
+ * DEFUPRI -- the default priority for user messages
+ * DEFSPRI -- the default priority for kernel messages
  *
  * Author: Eric Allman
  *
  * Author: Eric Allman
- * Modified to use UNIX domain IPC by Ralph Campbell
+ * extensive changes by Ralph Campbell
+ * more extensive changes by Eric Allman (again)
  */
 
  */
 
-#define DAEMON         1       /* Daemon user-id */
-#define        NLOGS           10      /* max number of log files */
-#define        NSUSERS         10      /* max number of special users */
-#define        MAXLINE         1024    /* maximum line length */
+#define        MAXLINE         1024            /* maximum line length */
+#define        MAXSVLINE       120             /* maximum saved line length */
+#define DEFUPRI                (LOG_USER|LOG_NOTICE)
+#define DEFSPRI                (LOG_KERN|LOG_CRIT)
+#define TIMERINTVL     30              /* interval for checking flush, mark */
 
 
-#include <syslog.h>
-#include <errno.h>
 #include <stdio.h>
 #include <utmp.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <utmp.h>
 #include <ctype.h>
-#include <sys/types.h>
+#include <strings.h>
+#include <setjmp.h>
+
+#include <sys/syslog.h>
+#include <sys/param.h>
+#include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#include <signal.h>
-#include <sysexits.h>
+#include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/msgbuf.h>
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/msgbuf.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <sys/time.h>
+#include <sys/resource.h>
+#include <sys/signal.h>
+
 #include <netinet/in.h>
 #include <netdb.h>
 
 #include <netinet/in.h>
 #include <netdb.h>
 
-char   logname[] = "/dev/log";
-char   defconf[] = "/etc/syslog.conf";
-char   defpid[] = "/etc/syslog.pid";
-char   ctty[] = "/dev/console";
+#define        CTTY    "/dev/console"
+char   *LogName = "/dev/log";
+char   *ConfFile = "/etc/syslog.conf";
+char   *PidFile = "/etc/syslog.pid";
+char   ctty[] = CTTY;
+
+#define FDMASK(fd)     (1 << (fd))
 
 #define        dprintf         if (Debug) printf
 
 
 #define        dprintf         if (Debug) printf
 
-#define UNAMESZ        8       /* length of a login name */
+#define UNAMESZ                8       /* length of a login name */
+#define MAXUNAMES      20      /* maximum number of user names */
+#define MAXFNAME       200     /* max file pathname length */
+
+#define NOPRI          0x10    /* the "no priority" priority */
+#define        LOG_MARK        LOG_MAKEPRI(LOG_NFACILITIES, 0) /* mark "facility" */
+
+/*
+ * Flags to logmsg().
+ */
+
+#define IGN_CONS       0x001   /* don't print on console */
+#define SYNC_FILE      0x002   /* do fsync on file after printing */
+#define ADDDATE                0x004   /* add a date to the message */
+#define MARK           0x008   /* this message is a mark */
 
 /*
  * This structure represents the files that will have log
 
 /*
  * This structure represents the files that will have log
@@ -65,43 +109,70 @@ char       ctty[] = "/dev/console";
  */
 
 struct filed {
  */
 
 struct filed {
-       int     f_file;                 /* file descriptor */
-       short   f_pmask;                /* priority mask */
-       short   f_flags;                /* see #defines below */
-       struct  sockaddr_in f_addr;     /* forwarding address */
-       char    f_name[248];            /* filename */
+       struct  filed *f_next;          /* next in linked list */
+       short   f_type;                 /* entry type, see below */
+       short   f_file;                 /* file descriptor */
+       time_t  f_time;                 /* time this was last written */
+       u_char  f_pmask[LOG_NFACILITIES+1];     /* priority mask */
+       union {
+               char    f_uname[MAXUNAMES][UNAMESZ+1];
+               struct {
+                       char    f_hname[MAXHOSTNAMELEN+1];
+                       struct sockaddr_in      f_addr;
+               } f_forw;               /* forwarding address */
+               char    f_fname[MAXFNAME];
+       } f_un;
+       char    f_prevline[MAXSVLINE];          /* last message logged */
+       char    f_lasttime[16];                 /* time of last occurrence */
+       char    f_prevhost[MAXHOSTNAMELEN+1];   /* host from which recd. */
+       int     f_prevpri;                      /* pri of f_prevline */
+       int     f_prevlen;                      /* length of f_prevline */
+       int     f_prevcount;                    /* repetition cnt of prevline */
+       int     f_repeatcount;                  /* number of "repeated" msgs */
 };
 
 };
 
-#define F_TTY  001             /* file is a tty */
-#define F_MARK 002             /* write to the file periodically */
-#define F_FORW 004             /* forward message to another host */
-#define F_CONS 010             /* file is the console */
-
-struct filed   Files[NLOGS];
+/*
+ * Intervals at which we flush out "message repeated" messages,
+ * in seconds after previous message is logged.  After each flush,
+ * we move to the next interval until we reach the largest.
+ */
+int    repeatinterval[] = { 30, 120, 600 };    /* # of secs before flush */
+#define        MAXREPEAT ((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1)
+#define        REPEATTIME(f)   ((f)->f_time + repeatinterval[(f)->f_repeatcount])
+#define        BACKOFF(f)      { if (++(f)->f_repeatcount > MAXREPEAT) \
+                                (f)->f_repeatcount = MAXREPEAT; \
+                       }
 
 
-/* list of superusers */
-struct susers {
-       short   s_pmask;                /* priority mask */
-       char    s_name[UNAMESZ+1];
+/* values for f_type */
+#define F_UNUSED       0               /* unused entry */
+#define F_FILE         1               /* regular file */
+#define F_TTY          2               /* terminal */
+#define F_CONSOLE      3               /* console terminal */
+#define F_FORW         4               /* remote machine */
+#define F_USERS                5               /* list of users */
+#define F_WALL         6               /* everyone logged on */
+
+char   *TypeNames[7] = {
+       "UNUSED",       "FILE",         "TTY",          "CONSOLE",
+       "FORW",         "USERS",        "WALL"
 };
 
 };
 
-struct susers Susers[NSUSERS];
+struct filed *Files;
+struct filed consfile;
 
 int    Debug;                  /* debug flag */
 
 int    Debug;                  /* debug flag */
-int    LogFile;                /* log file descriptor */
-int    DefPri = LOG_NOTICE;    /* default priority for untagged msgs */
-int    DefSysPri = LOG_EMERG;  /* default priority for untagged system msgs */
-int    Sumask;                 /* lowest priority written to super-users */
-int    MarkIntvl = 15;         /* mark interval in minutes */
-char   *ConfFile = defconf;    /* configuration file */
-char   host[32];               /* our hostname */
-char   rhost[32];              /* hostname of sender (forwarded messages) */
-int    inet = 0;               /* non-zero if INET sockets are being used */
-int    port;                   /* port number for INET connections */
+char   LocalHostName[MAXHOSTNAMELEN+1];        /* our hostname */
+char   *LocalDomain;           /* our local domain name */
+int    InetInuse = 0;          /* non-zero if INET sockets are being used */
+int    finet;                  /* Internet datagram socket */
+int    LogPort;                /* port number for INET connections */
+int    Initialized = 0;        /* set when we have initialized ourselves */
+int    MarkInterval = 20 * 60; /* interval between marks in seconds */
+int    MarkSeq = 0;            /* mark sequence number */
 
 extern int errno, sys_nerr;
 extern char *sys_errlist[];
 
 extern int errno, sys_nerr;
 extern char *sys_errlist[];
-extern char *ctime();
+extern char *ctime(), *index(), *calloc();
 
 main(argc, argv)
        int argc;
 
 main(argc, argv)
        int argc;
@@ -109,44 +180,35 @@ main(argc, argv)
 {
        register int i;
        register char *p;
 {
        register int i;
        register char *p;
-       int klog, funix, finet, defreadfds, len;
-       struct sockaddr_un sun, fromunix;
+       int funix, inetm, fklog, klogm, len;
+       struct sockaddr_un sunx, fromunix;
        struct sockaddr_in sin, frominet;
        FILE *fp;
        struct sockaddr_in sin, frominet;
        FILE *fp;
+       int ch;
        char line[MSG_BSIZE + 1];
        char line[MSG_BSIZE + 1];
-       extern int die(), domark();
-
-       sun.sun_family = AF_UNIX;
-       strncpy(sun.sun_path, logname, sizeof sun.sun_path);
-       gethostname(host, sizeof host);
-
-       while (--argc > 0) {
-               p = *++argv;
-               if (p[0] == '-') {
-                       switch (p[1]) {
-                       case 'm':               /* set mark interval */
-                               MarkIntvl = atoi(&p[2]);
-                               if (MarkIntvl <= 0)
-                                       MarkIntvl = 1;
-                               break;
-
-                       case 'f':               /* configuration file */
-                               if (p[2] != '\0')
-                                       ConfFile = &p[2];
-                               break;
-
-                       case 'd':               /* debug */
-                               Debug++;
-                               break;
+       extern int optind, die(), domark(), reapchild();
+       extern char *optarg;
 
 
-                       case 'p':               /* path */
-                               if (p[2] != '\0')
-                                       strncpy(sun.sun_path, &p[2], 
-                                               sizeof sun.sun_path);
-                               break;
-                       }
+       while ((ch = getopt(argc, argv, "df:m:p:")) != EOF)
+               switch((char)ch) {
+               case 'd':               /* debug */
+                       Debug++;
+                       break;
+               case 'f':               /* configuration file */
+                       ConfFile = optarg;
+                       break;
+               case 'm':               /* mark interval */
+                       MarkInterval = atoi(optarg) * 60;
+                       break;
+               case 'p':               /* path */
+                       LogName = optarg;
+                       break;
+               case '?':
+               default:
+                       usage();
                }
                }
-       }
+       if (argc -= optind)
+               usage();
 
        if (!Debug) {
                if (fork())
 
        if (!Debug) {
                if (fork())
@@ -156,26 +218,38 @@ main(argc, argv)
                (void) open("/", 0);
                (void) dup2(0, 1);
                (void) dup2(0, 2);
                (void) open("/", 0);
                (void) dup2(0, 1);
                (void) dup2(0, 2);
-               i = open("/dev/tty", O_RDWR);
-               if (i >= 0) {
-                       ioctl(i, TIOCNOTTY, (char *)0);
-                       (void) close(i);
-               }
+               untty();
+       } else
+               setlinebuf(stdout);
+
+       consfile.f_type = F_CONSOLE;
+       (void) strcpy(consfile.f_un.f_fname, ctty);
+       (void) gethostname(LocalHostName, sizeof LocalHostName);
+       if (p = index(LocalHostName, '.')) {
+               *p++ = '\0';
+               LocalDomain = p;
        }
        }
-       signal(SIGTERM, die);
+       else
+               LocalDomain = "";
+       (void) signal(SIGTERM, die);
+       (void) signal(SIGINT, Debug ? die : SIG_IGN);
+       (void) signal(SIGQUIT, Debug ? die : SIG_IGN);
+       (void) signal(SIGCHLD, reapchild);
+       (void) signal(SIGALRM, domark);
+       (void) alarm(TIMERINTVL);
+       (void) unlink(LogName);
+
+       sunx.sun_family = AF_UNIX;
+       (void) strncpy(sunx.sun_path, LogName, sizeof sunx.sun_path);
        funix = socket(AF_UNIX, SOCK_DGRAM, 0);
        funix = socket(AF_UNIX, SOCK_DGRAM, 0);
-       if (funix >= 0 && bind(funix, &sun,
-           sizeof(sun.sun_family)+strlen(sun.sun_path)) < 0) {
-               close(funix);
-               funix = -1;
+       if (funix < 0 || bind(funix, (struct sockaddr *) &sunx,
+           sizeof(sunx.sun_family)+strlen(sunx.sun_path)) < 0 ||
+           chmod(LogName, 0666) < 0) {
+               (void) sprintf(line, "cannot create %s", LogName);
+               logerror(line);
+               dprintf("cannot create %s (%d)\n", LogName, errno);
+               die(0);
        }
        }
-       if (funix < 0) {
-               fp = fopen(ctty, "w");
-               fprintf(fp, "\r\nsyslog: cannot create %s (%d)\r\n", logname, errno);
-               dprintf("cannot create %s (%d)\n", logname, errno);
-               exit(1);
-       }
-       defreadfds = 1 << funix;
        finet = socket(AF_INET, SOCK_DGRAM, 0);
        if (finet >= 0) {
                struct servent *sp;
        finet = socket(AF_INET, SOCK_DGRAM, 0);
        if (finet >= 0) {
                struct servent *sp;
@@ -184,77 +258,104 @@ main(argc, argv)
                if (sp == NULL) {
                        errno = 0;
                        logerror("syslog/udp: unknown service");
                if (sp == NULL) {
                        errno = 0;
                        logerror("syslog/udp: unknown service");
-                       die();
+                       die(0);
                }
                sin.sin_family = AF_INET;
                }
                sin.sin_family = AF_INET;
-               sin.sin_port = port = sp->s_port;
-               if (bind(finet, &sin, sizeof(sin), 0) < 0) {
+               sin.sin_port = LogPort = sp->s_port;
+               if (bind(finet, &sin, sizeof(sin)) < 0) {
                        logerror("bind");
                        logerror("bind");
-                       die();
+                       if (!Debug)
+                               die(0);
+               } else {
+                       inetm = FDMASK(finet);
+                       InetInuse = 1;
                }
                }
-               defreadfds |= 1 << finet;
-               inet = 1;
        }
        }
-       if ((klog = open("/dev/klog", O_RDONLY)) >= 0)
-               defreadfds |= 1 << klog;
-       else
+       if ((fklog = open("/dev/klog", O_RDONLY)) >= 0)
+               klogm = FDMASK(fklog);
+       else {
                dprintf("can't open /dev/klog (%d)\n", errno);
                dprintf("can't open /dev/klog (%d)\n", errno);
+               klogm = 0;
+       }
 
        /* tuck my process id away */
 
        /* tuck my process id away */
-       fp = fopen(defpid, "w");
+       fp = fopen(PidFile, "w");
        if (fp != NULL) {
                fprintf(fp, "%d\n", getpid());
        if (fp != NULL) {
                fprintf(fp, "%d\n", getpid());
-               fclose(fp);
+               (void) fclose(fp);
        }
 
        dprintf("off & running....\n");
 
        }
 
        dprintf("off & running....\n");
 
-       for (i = 0; i < NLOGS; i++)
-               Files[i].f_file = -1;
        init();
        init();
-       signal(SIGALRM, domark);
-       alarm(MarkIntvl * 60);
+       (void) signal(SIGHUP, init);
 
        for (;;) {
 
        for (;;) {
-               int domain, nfds, readfds = defreadfds;
+               int nfds, readfds = FDMASK(funix) | inetm | klogm;
 
 
-               nfds = select(20, &readfds, 0, 0, 0);
+               errno = 0;
+               dprintf("readfds = %#x\n", readfds);
+               nfds = select(20, (fd_set *) &readfds, (fd_set *) NULL,
+                                 (fd_set *) NULL, (struct timeval *) NULL);
                if (nfds == 0)
                        continue;
                if (nfds < 0) {
                if (nfds == 0)
                        continue;
                if (nfds < 0) {
-                       if (errno == EINTR)
-                               continue;
-                       logerror("select");
+                       if (errno != EINTR)
+                               logerror("select");
                        continue;
                }
                        continue;
                }
-               if (readfds & (1 << funix)) {
-                       domain = AF_UNIX;
+               dprintf("got a message (%d, %#x)\n", nfds, readfds);
+               if (readfds & klogm) {
+                       i = read(fklog, line, sizeof(line) - 1);
+                       if (i > 0) {
+                               line[i] = '\0';
+                               printsys(line);
+                       } else if (i < 0 && errno != EINTR) {
+                               logerror("klog");
+                               fklog = -1;
+                               klogm = 0;
+                       }
+               }
+               if (readfds & FDMASK(funix)) {
                        len = sizeof fromunix;
                        len = sizeof fromunix;
-                       i = recvfrom(funix, line, MAXLINE, 0, &fromunix, &len);
-               } else if (readfds & (1 << finet)) {
-                       domain = AF_INET;
+                       i = recvfrom(funix, line, MAXLINE, 0,
+                                    (struct sockaddr *) &fromunix, &len);
+                       if (i > 0) {
+                               line[i] = '\0';
+                               printline(LocalHostName, line);
+                       } else if (i < 0 && errno != EINTR)
+                               logerror("recvfrom unix");
+               }
+               if (readfds & inetm) {
                        len = sizeof frominet;
                        i = recvfrom(finet, line, MAXLINE, 0, &frominet, &len);
                        len = sizeof frominet;
                        i = recvfrom(finet, line, MAXLINE, 0, &frominet, &len);
-               } else {
-                       i = read(klog, line, sizeof(line) - 1);
-                       if (i < 0) {
-                               logerror("read");
-                               continue;
-                       }
-                       line[i] = '\0';
-                       printsys(line);
-                       continue;
-               }
-               if (i < 0) {
-                       if (errno == EINTR)
-                               continue;
-                       logerror("recvfrom");
-                       continue;
+                       if (i > 0) {
+                               extern char *cvthname();
+
+                               line[i] = '\0';
+                               printline(cvthname(&frominet), line);
+                       } else if (i < 0 && errno != EINTR)
+                               logerror("recvfrom inet");
+               } 
+       }
+}
+
+usage()
+{
+       fprintf(stderr, "usage: syslogd [-d] [-m markinterval] [-p path] [-f conffile]\n");
+       exit(1);
+}
+
+untty()
+{
+       int i;
+
+       if (!Debug) {
+               i = open("/dev/tty", O_RDWR);
+               if (i >= 0) {
+                       (void) ioctl(i, (int) TIOCNOTTY, (char *)0);
+                       (void) close(i);
                }
                }
-               if (domain == AF_INET && !chkhost(&frominet))
-                       continue;
-               line[i] = '\0';
-               printline(domain != AF_INET, line);
        }
 }
 
        }
 }
 
@@ -263,8 +364,8 @@ main(argc, argv)
  * on the appropriate log files.
  */
 
  * on the appropriate log files.
  */
 
-printline(local, msg)
-       int local;
+printline(hname, msg)
+       char *hname;
        char *msg;
 {
        register char *p, *q;
        char *msg;
 {
        register char *p, *q;
@@ -273,40 +374,36 @@ printline(local, msg)
        int pri;
 
        /* test for special codes */
        int pri;
 
        /* test for special codes */
-       pri = DefPri;
+       pri = DEFUPRI;
        p = msg;
        p = msg;
-       if (p[0] == '<' && p[2] == '>') {
-               switch (p[1]) {
-               case '*':       /* reset default message priority */
-                       dprintf("default priority = %c\n", p[3]);
-                       c = p[3] - '0';
-                       if ((unsigned) c <= 9)
-                               DefPri = c;
-                       break;
-
-               case '$':       /* reconfigure */
-                       dprintf("reconfigure\n");
-                       init();
-               }
-               p++;
-               pri = *p++ - '0';
-               p++;
-               if ((unsigned) pri > LOG_DEBUG)
-                       pri = DefPri;
+       if (*p == '<') {
+               pri = 0;
+               while (isdigit(*++p))
+                       pri = 10 * pri + (*p - '0');
+               if (*p == '>')
+                       ++p;
        }
        }
+       if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
+               pri = DEFUPRI;
+
+       /* don't allow users to log kernel messages */
+       if (LOG_FAC(pri) == LOG_KERN)
+               pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
 
        q = line;
 
        q = line;
-       while ((c = *p++ & 0177) != '\0' && c != '\n' &&
-           q < &line[sizeof(line) - 1]) {
-               if (iscntrl(c)) {
+
+       while ((c = *p++ & 0177) != '\0' &&
+           q < &line[sizeof(line) - 1])
+               if (c == '\n')
+                       *q++ = ' ';
+               else if (iscntrl(c)) {
                        *q++ = '^';
                        *q++ = c ^ 0100;
                } else
                        *q++ = c;
                        *q++ = '^';
                        *q++ = c ^ 0100;
                } else
                        *q++ = c;
-       }
        *q = '\0';
 
        *q = '\0';
 
-       logmsg(pri, line, local ? host : rhost, 0);
+       logmsg(pri, line, hname, 0);
 }
 
 /*
 }
 
 /*
@@ -319,307 +416,269 @@ printsys(msg)
        register char *p, *q;
        register int c;
        char line[MAXLINE + 1];
        register char *p, *q;
        register int c;
        char line[MAXLINE + 1];
-       static char prevline[MAXLINE + 1];
-       static int count = 0;
-       int pri, ign;
-       long now;
+       int pri, flags;
+       char *lp;
 
 
-       time(&now);
+       (void) sprintf(line, "vmunix: ");
+       lp = line + strlen(line);
        for (p = msg; *p != '\0'; ) {
        for (p = msg; *p != '\0'; ) {
-               /* test for special codes */
-               ign = 0;
-               pri = DefSysPri;
-               if (p[0] == '<' && p[2] == '>') {
-                       switch (p[1]) {
-                       case '*':       /* reset default message priority */
-                               dprintf("default priority = %c\n", p[3]);
-                               c = p[3] - '0';
-                               if ((unsigned) c <= 9)
-                                       DefSysPri = c;
-                               break;
-
-                       case '$':       /* reconfigure */
-                               dprintf("reconfigure\n");
-                               init();
-                       }
-                       p++;
-                       pri = *p++ - '0';
-                       p++;
-                       if ((unsigned) pri > LOG_DEBUG)
-                               pri = DefSysPri;
-               } else
-                       ign = 1; /* kernel printf's come out on console */
-
-               q = line;
-               sprintf(q, "vmunix: %.15s-- ", ctime(&now) + 4);
-               q += strlen(q);
-               while ((c = *p++) != '\0' && c != '\n' &&
-                   q < &line[sizeof(line) - 1])
+               flags = SYNC_FILE | ADDDATE;    /* fsync file after write */
+               pri = DEFSPRI;
+               if (*p == '<') {
+                       pri = 0;
+                       while (isdigit(*++p))
+                               pri = 10 * pri + (*p - '0');
+                       if (*p == '>')
+                               ++p;
+               } else {
+                       /* kernel printf's come out on console */
+                       flags |= IGN_CONS;
+               }
+               if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
+                       pri = DEFSPRI;
+               q = lp;
+               while (*p != '\0' && (c = *p++) != '\n' &&
+                   q < &line[MAXLINE])
                        *q++ = c;
                *q = '\0';
                        *q++ = c;
                *q = '\0';
-               if (strcmp(line+26, prevline+26) == 0) {
-                       count++;
-                       strncpy(prevline+8, line+8, 15); /* update time */
-                       continue;
-               }
-               if (count) {
-                       if (count > 1)
-                               sprintf(prevline+26,
-                                   "last message repeated %d times", count);
-                       logmsg(pri, prevline, host, ign);
-               }
-               count = 0;
-               strcpy(prevline, line);
-               logmsg(pri, line, host, ign);
+               logmsg(pri, line, LocalHostName, flags);
        }
 }
 
        }
 }
 
+time_t now;
+
 /*
  * Log a message to the appropriate log files, users, etc. based on
  * the priority.
  */
 
 /*
  * Log a message to the appropriate log files, users, etc. based on
  * the priority.
  */
 
-logmsg(pri, msg, from, igncons)
-       int     pri;
-       char    *msg, *from;
-       int     igncons;
+logmsg(pri, msg, from, flags)
+       int pri;
+       char *msg, *from;
+       int flags;
 {
 {
-       char line[MAXLINE + 1];
        register struct filed *f;
        register struct filed *f;
-       register int l;
-       struct iovec iov[4];
-       register struct iovec *v = iov;
+       int fac, prilev;
+       int omask, msglen;
+       char *timestamp;
 
 
-       v->iov_base = from;
-       v->iov_len = strlen(v->iov_base);
-       v++;
-       v->iov_base = " ";
-       v->iov_len = 1;
-       v++;
-       v->iov_base = msg;
-       v->iov_len = strlen(v->iov_base);
-       v++;
-       /* log the message to the particular outputs */
-       for (f = Files; f < &Files[NLOGS]; f++) {
-               if (f->f_file < 0 || f->f_pmask < pri)
-                       continue;
-               if (igncons && (f->f_flags & F_CONS))
-                       continue;
-               if (pri < 0) {  /* mark message */
-                       struct stat stb;
-                       long now;
+       dprintf("logmsg: pri %o, flags %x, from %s, msg %s\n", pri, flags, from, msg);
 
 
-                       if (!(f->f_flags & F_MARK))
-                               continue;
-                       if (fstat(f->f_file, &stb) < 0)
-                               continue;
-                       time(&now);
-                       if (!(f->f_flags & F_CONS) &&
-                           stb.st_mtime > now - MarkIntvl * 60)
-                               continue;
-               }
-               if (f->f_flags & F_FORW) {
-                       sprintf(line, "<%d>%s", pri, msg);
-                       l = strlen(line);
-                       if (l > MAXLINE)
-                               l = MAXLINE;
-                       if (sendto(f->f_file, line, l, 0,
-                           &f->f_addr, sizeof f->f_addr) != l)
-                               logerror("sendto");
-                       continue;
-               }
-               if (f->f_flags & F_TTY) {
-                       v->iov_base = "\r\n";
-                       v->iov_len = 2;
-               } else {
-                       v->iov_base = "\n";
-                       v->iov_len = 1;
-               }
-               if (writev(f->f_file, iov, 4) < 0) {
-                       logerror(f->f_name);
-                       (void) close(f->f_file);
-                       f->f_file = -1;
-               }
-       }
+       omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM));
 
        /*
 
        /*
-        * Output high priority messages to terminals.
+        * Check to see if msg looks non-standard.
         */
         */
-       if (pri >= 0 && pri <= Sumask)
-               wallmsg(pri, msg, from);
-}
-
-/*
- *  INIT -- Initialize syslog from configuration table
- *
- *     The configuration table consists of a series of lines
- *     broken into two sections by a blank line.  The first
- *     section gives a list of files to log on.  The first
- *     character is a digit which is the priority mask for
- *     that file.  If the second character is an asterisk, then
- *     syslog arranges for something to be printed every fifteen
- *     minutes (even if only a null line), so that crashes and
- *     other events can be localized.  The rest of the line is
- *     the pathname of the log file.  The second section is
- *     a list of user names; these people are all notified
- *     when subalert messages occur (if they are logged on).
- *
- *     The configuration table will be reread by this routine
- *     if a signal 1 occurs; for that reason, it is tricky
- *     about not re-opening files and closing files it will
- *     not be using.
- */
-
-init()
-{
-       register int i;
-       register FILE *cf;
-       register struct filed *f;
-       register char *p;
-       char cline[BUFSIZ];
-       struct servent *sp;
-       struct hostent *hp;
-       int pmask, flags;
-       long now;
+       msglen = strlen(msg);
+       if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' ||
+           msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')
+               flags |= ADDDATE;
+
+       (void) time(&now);
+       if (flags & ADDDATE)
+               timestamp = ctime(&now) + 4;
+       else {
+               timestamp = msg;
+               msg += 16;
+               msglen -= 16;
+       }
 
 
-       dprintf("init\n");
+       /* extract facility and priority level */
+       if (flags & MARK)
+               fac = LOG_NFACILITIES;
+       else
+               fac = LOG_FAC(pri);
+       prilev = LOG_PRI(pri);
 
 
-       /* ignore interrupts during this routine */
-       signal(SIGHUP, SIG_IGN);
+       /* log the message to the particular outputs */
+       if (!Initialized) {
+               f = &consfile;
+               f->f_file = open(ctty, O_WRONLY);
 
 
-       /*
-        *  Close all open log files.
-        */
-       for (f = Files; f < &Files[NLOGS]; f++) {
-               if (f->f_file >= 0)
+               if (f->f_file >= 0) {
+                       untty();
+                       fprintlog(f, flags, msg);
                        (void) close(f->f_file);
                        (void) close(f->f_file);
-               f->f_file = -1;
-       }
-
-       /* open the configuration file */
-       if ((cf = fopen(ConfFile, "r")) == NULL) {
-               dprintf("cannot open %s\n", ConfFile);
-               f = Files;
-               if ((f->f_file = open(ctty, O_WRONLY)) >= 0) {
-                       strncpy(f->f_name, ctty, sizeof(f->f_name)-1);
-                       f->f_pmask = LOG_CRIT;
-                       f->f_flags = F_TTY|F_MARK|F_CONS;
                }
                }
+               (void) sigsetmask(omask);
                return;
        }
                return;
        }
+       for (f = Files; f; f = f->f_next) {
+               /* skip messages that are incorrect priority */
+               if (f->f_pmask[fac] < prilev || f->f_pmask[fac] == NOPRI)
+                       continue;
 
 
-       /*
-        *  Foreach line in the conf table, open that file.
-        */
-       f = Files;
-       sp = getservbyname("syslogd", "udp");
-       while (fgets(cline, sizeof cline, cf) != NULL) {
-               /* check for end-of-section */
-               if (cline[0] == '\n')
-                       break;
-
-               /* strip off newline character */
-               for (p = cline; *p != '\0'; p++)
-                       if (*p == '\n') {
-                               *p = '\0';
-                               break;
-                       }
-
-               dprintf("F: got line '%s'\n", cline);
-
-               /* extract priority mask and mark flag */
-               p = cline;
-               flags = 0;
-               pmask = *p++ - '0';
-               if (*p == '*') {
-                       p++;
-                       flags |= F_MARK;
-               }
-
-               if (f >= &Files[NLOGS])
+               if (f->f_type == F_CONSOLE && (flags & IGN_CONS))
                        continue;
 
                        continue;
 
-               /* mark entry as used and update flags */
-               if (*p == '@') {
-                       if (!inet)
-                               continue;
-                       hp = gethostbyname(++p);
-                       if (hp == NULL) {
-                               char buf[100];
+               /* don't output marks to recently written files */
+               if ((flags & MARK) && (now - f->f_time) < MarkInterval / 2)
+                       continue;
 
 
-                               sprintf(buf, "unknown host %s", p);
-                               errno = 0;
-                               logerror(buf);
-                               continue;
+               /*
+                * suppress duplicate lines to this file
+                */
+               if ((flags & MARK) == 0 && msglen == f->f_prevlen &&
+                   !strcmp(msg, f->f_prevline) &&
+                   !strcmp(from, f->f_prevhost)) {
+                       (void) strncpy(f->f_lasttime, timestamp, 15);
+                       f->f_prevcount++;
+                       dprintf("msg repeated %d times, %ld sec of %d\n",
+                           f->f_prevcount, now - f->f_time,
+                           repeatinterval[f->f_repeatcount]);
+                       /*
+                        * If domark would have logged this by now,
+                        * flush it now (so we don't hold isolated messages),
+                        * but back off so we'll flush less often
+                        * in the future.
+                        */
+                       if (now > REPEATTIME(f)) {
+                               fprintlog(f, flags, (char *)NULL);
+                               BACKOFF(f);
                        }
                        }
-                       bzero(&f->f_addr, sizeof f->f_addr);
-                       f->f_addr.sin_family = AF_INET;
-                       f->f_addr.sin_port = port;
-                       bcopy(hp->h_addr, (char *) &f->f_addr.sin_addr, hp->h_length);
-                       f->f_file = socket(AF_INET, SOCK_DGRAM, 0);
-                       if (f->f_file < 0) {
-                               logerror("socket");
-                               continue;
+               } else {
+                       /* new line, save it */
+                       if (f->f_prevcount)
+                               fprintlog(f, 0, (char *)NULL);
+                       f->f_repeatcount = 0;
+                       (void) strncpy(f->f_lasttime, timestamp, 15);
+                       (void) strncpy(f->f_prevhost, from,
+                                       sizeof(f->f_prevhost));
+                       if (msglen < MAXSVLINE) {
+                               f->f_prevlen = msglen;
+                               f->f_prevpri = pri;
+                               (void) strcpy(f->f_prevline, msg);
+                               fprintlog(f, flags, (char *)NULL);
+                       } else {
+                               f->f_prevline[0] = 0;
+                               f->f_prevlen = 0;
+                               fprintlog(f, flags, msg);
                        }
                        }
-                       flags |= F_FORW;
-                       f->f_pmask = pmask;
-                       f->f_flags = flags;
-                       dprintf("Host %s pmask %d flags %o\n", p, pmask, flags);
-                       f++;
-                       continue;
-               }
-               strncpy(f->f_name, p, sizeof(f->f_name)-1);
-               if ((f->f_file = open(p, O_WRONLY|O_APPEND|O_NDELAY)) < 0) {
-                       logerror(p);
-                       continue;
                }
                }
-               if (isatty(f->f_file))
-                       flags |= F_TTY;
-               if (strcmp(p, ctty) == 0)
-                       flags |= F_CONS;
-               f->f_pmask = pmask;
-               f->f_flags = flags;
-               dprintf("File %s pmask %d flags %o\n", p, pmask, flags);
-               f++;
        }
        }
+       (void) sigsetmask(omask);
+}
 
 
-       /*
-        *  Read the list of users.
-        *
-        *      Anyone in this list is informed directly if s/he
-        *      is logged in when a high priority message comes through.
-        */
-       Sumask = LOG_SALERT;
-       for (i = 0; i < NSUSERS && fgets(cline, sizeof cline, cf) != NULL; i++) {
-               /* strip off newline */
-               for (p = cline; *p != '\0'; p++)
-                       if (*p == '\n') {
-                               *p = '\0';
-                               break;
-                       }
-               dprintf("U: got line '%s'\n", cline);
-               p = cline;
-               if (isdigit(*p)) {
-                       Susers[i].s_pmask = pmask = *p++ - '0';
-                       if (pmask > Sumask)
-                               Sumask = pmask;
-               } else
-                       Susers[i].s_pmask = pmask = LOG_SALERT;
-               strncpy(Susers[i].s_name, p, UNAMESZ);
-               dprintf("Suser %s pmask %d\n", p, pmask);
+fprintlog(f, flags, msg)
+       register struct filed *f;
+       int flags;
+       char *msg;
+{
+       struct iovec iov[6];
+       register struct iovec *v = iov;
+       register int l;
+       char line[MAXLINE + 1];
+       char repbuf[80];
+
+       v->iov_base = f->f_lasttime;
+       v->iov_len = 15;
+       v++;
+       v->iov_base = " ";
+       v->iov_len = 1;
+       v++;
+       v->iov_base = f->f_prevhost;
+       v->iov_len = strlen(v->iov_base);
+       v++;
+       v->iov_base = " ";
+       v->iov_len = 1;
+       v++;
+       if (msg) {
+               v->iov_base = msg;
+               v->iov_len = strlen(msg);
+       } else if (f->f_prevcount > 1) {
+               (void) sprintf(repbuf, "last message repeated %d times",
+                   f->f_prevcount);
+               v->iov_base = repbuf;
+               v->iov_len = strlen(repbuf);
+       } else {
+               v->iov_base = f->f_prevline;
+               v->iov_len = f->f_prevlen;
        }
        }
+       v++;
 
 
-       /* zero the rest of the old superusers */
-       while (i < NSUSERS)
-               Susers[i++].s_name[0] = '\0';
+       dprintf("Logging to %s", TypeNames[f->f_type]);
+       f->f_time = now;
+
+       switch (f->f_type) {
+       case F_UNUSED:
+               dprintf("\n");
+               break;
+
+       case F_FORW:
+               dprintf(" %s\n", f->f_un.f_forw.f_hname);
+               (void) sprintf(line, "<%d>%.15s %s", f->f_prevpri,
+                       iov[0].iov_base, iov[4].iov_base);
+               l = strlen(line);
+               if (l > MAXLINE)
+                       l = MAXLINE;
+               if (sendto(finet, line, l, 0, &f->f_un.f_forw.f_addr,
+                   sizeof f->f_un.f_forw.f_addr) != l) {
+                       int e = errno;
+                       (void) close(f->f_file);
+                       f->f_type = F_UNUSED;
+                       errno = e;
+                       logerror("sendto");
+               }
+               break;
 
 
-       /* close the configuration file */
-       (void) fclose(cf);
+       case F_CONSOLE:
+               if (flags & IGN_CONS) {
+                       dprintf(" (ignored)\n");
+                       break;
+               }
+               /* FALLTHROUGH */
 
 
-       dprintf("syslogd: restarted\n");
+       case F_TTY:
+       case F_FILE:
+               dprintf(" %s\n", f->f_un.f_fname);
+               if (f->f_type != F_FILE) {
+                       v->iov_base = "\r\n";
+                       v->iov_len = 2;
+               } else {
+                       v->iov_base = "\n";
+                       v->iov_len = 1;
+               }
+       again:
+               if (writev(f->f_file, iov, 6) < 0) {
+                       int e = errno;
+                       (void) close(f->f_file);
+                       /*
+                        * Check for EBADF on TTY's due to vhangup() XXX
+                        */
+                       if (e == EBADF && f->f_type != F_FILE) {
+                               f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND);
+                               if (f->f_file < 0) {
+                                       f->f_type = F_UNUSED;
+                                       logerror(f->f_un.f_fname);
+                               } else {
+                                       untty();
+                                       goto again;
+                               }
+                       } else {
+                               f->f_type = F_UNUSED;
+                               errno = e;
+                               logerror(f->f_un.f_fname);
+                       }
+               } else if (flags & SYNC_FILE)
+                       (void) fsync(f->f_file);
+               break;
+
+       case F_USERS:
+       case F_WALL:
+               dprintf("\n");
+               v->iov_base = "\r\n";
+               v->iov_len = 2;
+               wallmsg(f, iov);
+               break;
+       }
+       f->f_prevcount = 0;
+}
 
 
-       /* arrange for signal 1 to reconfigure */
-       signal(SIGHUP, init);
+jmp_buf ttybuf;
+
+endtty()
+{
+       longjmp(ttybuf, 1);
 }
 
 /*
 }
 
 /*
@@ -629,122 +688,153 @@ init()
  *     world, or a list of approved users.
  */
 
  *     world, or a list of approved users.
  */
 
-wallmsg(pri, msg, from)
-       int pri;
-       char *msg, *from;
+wallmsg(f, iov)
+       register struct filed *f;
+       struct iovec *iov;
 {
        register char *p;
        register int i;
 {
        register char *p;
        register int i;
-       int f, flags, len, e;
+       int ttyf, len;
        FILE *uf;
        FILE *uf;
+       static int reenter = 0;
        struct utmp ut;
        struct utmp ut;
-       long now;
-       char line[MAXLINE + 100];
+       char greetings[200];
+
+       if (reenter++)
+               return;
 
        /* open the user login file */
        if ((uf = fopen("/etc/utmp", "r")) == NULL) {
                logerror("/etc/utmp");
 
        /* open the user login file */
        if ((uf = fopen("/etc/utmp", "r")) == NULL) {
                logerror("/etc/utmp");
+               reenter = 0;
                return;
        }
 
                return;
        }
 
-       time(&now);
-       sprintf(line,
-           "\r\n\7Message from syslogd@%s at %.24s ...\r\n%s\r\n",
-               from, ctime(&now), msg);
-       len = strlen(line);
-
-       /* scan the user login file */
-       while (fread(&ut, sizeof ut, 1, uf) == 1) {
-               /* is this slot used? */
-               if (ut.ut_name[0] == '\0')
-                       continue;
+       /*
+        * Might as well fork instead of using nonblocking I/O
+        * and doing notty().
+        */
+       if (fork() == 0) {
+               (void) signal(SIGTERM, SIG_DFL);
+               (void) alarm(0);
+               (void) signal(SIGALRM, endtty);
+               (void) signal(SIGTTOU, SIG_IGN);
+               (void) sigsetmask(0);
+               (void) sprintf(greetings,
+                   "\r\n\7Message from syslogd@%s at %.24s ...\r\n",
+                       iov[2].iov_base, ctime(&now));
+               len = strlen(greetings);
+
+               /* scan the user login file */
+               while (fread((char *) &ut, sizeof ut, 1, uf) == 1) {
+                       /* is this slot used? */
+                       if (ut.ut_name[0] == '\0')
+                               continue;
 
 
-               /* should we send the message to this user? */
-               if (pri != LOG_ALERT) {
-                       for (i = 0; i < NSUSERS; i++) {
-                               if (pri > Susers[i].s_pmask)
+                       /* should we send the message to this user? */
+                       if (f->f_type == F_USERS) {
+                               for (i = 0; i < MAXUNAMES; i++) {
+                                       if (!f->f_un.f_uname[i][0]) {
+                                               i = MAXUNAMES;
+                                               break;
+                                       }
+                                       if (strncmp(f->f_un.f_uname[i],
+                                           ut.ut_name, UNAMESZ) == 0)
+                                               break;
+                               }
+                               if (i >= MAXUNAMES)
                                        continue;
                                        continue;
-                               if (strncmp(Susers[i].s_name, ut.ut_name,
-                                   sizeof ut.ut_name) == 0)
-                                       goto prmsg;
                        }
                        }
-                       continue;
-               }
-       prmsg:
 
 
-               /* compute the device name */
-               p = "/dev/12345678";
-               strcpyn(&p[5], ut.ut_line, UNAMESZ);
+                       /* compute the device name */
+                       p = "/dev/12345678";
+                       strncpy(&p[5], ut.ut_line, UNAMESZ);
 
 
-               /* open the terminal */
-               f = open(p, O_WRONLY|O_NDELAY);
-               if (f < 0)
-                       continue;
-               if ((flags = fcntl(f, F_GETFL, 0)) == -1) {
-                       (void) close(f);
-                       continue;
-               }
-               if (fcntl(f, F_SETFL, flags | FNDELAY) == -1)
-                       goto oldway;
-               i = write(f, line, len);
-               e = errno;
-               (void) fcntl(f, F_SETFL, flags);
-               if (i == len || e != EWOULDBLOCK) {
-                       (void) close(f);
-                       continue;
-               }
-       oldway:
-               if (fork() == 0) {
-                       (void) write(f, line, len);
-                       exit(0);
+                       if (f->f_type == F_WALL) {
+                               iov[0].iov_base = greetings;
+                               iov[0].iov_len = len;
+                               iov[1].iov_len = 0;
+                       }
+                       if (setjmp(ttybuf) == 0) {
+                               (void) alarm(15);
+                               /* open the terminal */
+                               ttyf = open(p, O_WRONLY);
+                               if (ttyf >= 0) {
+                                       struct stat statb;
+
+                                       if (fstat(ttyf, &statb) == 0 &&
+                                           (statb.st_mode & S_IWRITE))
+                                               (void) writev(ttyf, iov, 6);
+                                       close(ttyf);
+                                       ttyf = -1;
+                               }
+                       }
+                       (void) alarm(0);
                }
                }
-               (void) close(f);
+               exit(0);
        }
        }
-
        /* close the user login file */
        /* close the user login file */
-       (void) close(uf);
+       (void) fclose(uf);
+       reenter = 0;
 }
 
 }
 
-/*
- * Make sure every marked file gets written to periodically.
- * Reset the alarm clock to call itself after MarkIntvl minutes.
- */
-domark()
+reapchild()
 {
 {
-       char buf[40];
-       long now;
-
-       dprintf("domark\n");
+       union wait status;
 
 
-       time(&now);
-       sprintf(buf, "syslogd: %.24s-- MARK", ctime(&now));
-       logmsg(-1, buf, host, 0);
-       alarm(MarkIntvl * 60);
+       while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
+               ;
 }
 
 /*
 }
 
 /*
- * Check to see if we should log this message.
+ * Return a printable representation of a host address.
  */
  */
-chkhost(f)
+char *
+cvthname(f)
        struct sockaddr_in *f;
 {
        struct hostent *hp;
        struct sockaddr_in *f;
 {
        struct hostent *hp;
+       register char *p;
        extern char *inet_ntoa();
 
        extern char *inet_ntoa();
 
-       dprintf("chkhost\n");
+       dprintf("cvthname(%s)\n", inet_ntoa(f->sin_addr));
 
        if (f->sin_family != AF_INET) {
                dprintf("Malformed from address\n");
 
        if (f->sin_family != AF_INET) {
                dprintf("Malformed from address\n");
-               return (0);
+               return ("???");
        }
        hp = gethostbyaddr(&f->sin_addr, sizeof(struct in_addr), f->sin_family);
        if (hp == 0) {
                dprintf("Host name for your address (%s) unknown\n",
                        inet_ntoa(f->sin_addr));
        }
        hp = gethostbyaddr(&f->sin_addr, sizeof(struct in_addr), f->sin_family);
        if (hp == 0) {
                dprintf("Host name for your address (%s) unknown\n",
                        inet_ntoa(f->sin_addr));
-               return (0);
+               return (inet_ntoa(f->sin_addr));
+       }
+       if ((p = index(hp->h_name, '.')) && strcmp(p + 1, LocalDomain) == 0)
+               *p = '\0';
+       return (hp->h_name);
+}
+
+domark()
+{
+       register struct filed *f;
+
+       now = time(0);
+       MarkSeq += TIMERINTVL;
+       if (MarkSeq >= MarkInterval) {
+               logmsg(LOG_INFO, "-- MARK --", LocalHostName, ADDDATE|MARK);
+               MarkSeq = 0;
        }
        }
-       strncpy(rhost, hp->h_name, sizeof rhost);
-       return (1);
+
+       for (f = Files; f; f = f->f_next) {
+               if (f->f_prevcount && now >= REPEATTIME(f)) {
+                       dprintf("flush %s: repeated %d times, %d sec.\n",
+                           TypeNames[f->f_type], f->f_prevcount,
+                           repeatinterval[f->f_repeatcount]);
+                       fprintlog(f, 0, (char *)NULL);
+                       BACKOFF(f);
+               }
+       }
+       (void) alarm(TIMERINTVL);
 }
 
 /*
 }
 
 /*
@@ -754,26 +844,352 @@ logerror(type)
        char *type;
 {
        char buf[100];
        char *type;
 {
        char buf[100];
-       long now;
 
 
-       time(&now);
        if (errno == 0)
        if (errno == 0)
-               sprintf(buf, "syslogd: %.24s-- %s", ctime(&now), type);
+               (void) sprintf(buf, "syslogd: %s", type);
        else if ((unsigned) errno > sys_nerr)
        else if ((unsigned) errno > sys_nerr)
-               sprintf(buf, "syslogd: %.24s-- %s: error %d",
-                       ctime(&now), type, errno);
+               (void) sprintf(buf, "syslogd: %s: error %d", type, errno);
        else
        else
-               sprintf(buf, "syslogd: %.24s-- %s: %s",
-                       ctime(&now), type, sys_errlist[errno]);
+               (void) sprintf(buf, "syslogd: %s: %s", type, sys_errlist[errno]);
        errno = 0;
        dprintf("%s\n", buf);
        errno = 0;
        dprintf("%s\n", buf);
-       logmsg(LOG_ERR, buf, host, 0);
+       logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE);
 }
 
 }
 
-die()
+die(sig)
 {
 {
+       register struct filed *f;
+       char buf[100];
 
 
-       dprintf("syslogd: going down\n");
-       (void) unlink(logname);
+       for (f = Files; f != NULL; f = f->f_next) {
+               /* flush any pending output */
+               if (f->f_prevcount)
+                       fprintlog(f, 0, (char *)NULL);
+       }
+       if (sig) {
+               dprintf("syslogd: exiting on signal %d\n", sig);
+               (void) sprintf(buf, "exiting on signal %d", sig);
+               errno = 0;
+               logerror(buf);
+       }
+       (void) unlink(LogName);
        exit(0);
 }
        exit(0);
 }
+
+/*
+ *  INIT -- Initialize syslogd from configuration table
+ */
+
+init()
+{
+       register int i;
+       register FILE *cf;
+       register struct filed *f, *next, **nextp;
+       register char *p;
+       char cline[BUFSIZ];
+
+       dprintf("init\n");
+
+       /*
+        *  Close all open log files.
+        */
+       Initialized = 0;
+       for (f = Files; f != NULL; f = next) {
+               /* flush any pending output */
+               if (f->f_prevcount)
+                       fprintlog(f, 0, (char *)NULL);
+
+               switch (f->f_type) {
+                 case F_FILE:
+                 case F_TTY:
+                 case F_CONSOLE:
+                       (void) close(f->f_file);
+                       break;
+               }
+               next = f->f_next;
+               free((char *) f);
+       }
+       Files = NULL;
+       nextp = &Files;
+
+       /* open the configuration file */
+       if ((cf = fopen(ConfFile, "r")) == NULL) {
+               dprintf("cannot open %s\n", ConfFile);
+               *nextp = (struct filed *)calloc(1, sizeof(*f));
+               cfline("*.ERR\t/dev/console", *nextp);
+               (*nextp)->f_next = (struct filed *)calloc(1, sizeof(*f));
+               cfline("*.PANIC\t*", (*nextp)->f_next);
+               Initialized = 1;
+               return;
+       }
+
+       /*
+        *  Foreach line in the conf table, open that file.
+        */
+       f = NULL;
+       while (fgets(cline, sizeof cline, cf) != NULL) {
+               /*
+                * check for end-of-section, comments, strip off trailing
+                * spaces and newline character.
+                */
+               for (p = cline; isspace(*p); ++p);
+               if (*p == NULL || *p == '#')
+                       continue;
+               for (p = index(cline, '\0'); isspace(*--p););
+               *++p = '\0';
+               f = (struct filed *)calloc(1, sizeof(*f));
+               *nextp = f;
+               nextp = &f->f_next;
+               cfline(cline, f);
+       }
+
+       /* close the configuration file */
+       (void) fclose(cf);
+
+       Initialized = 1;
+
+       if (Debug) {
+               for (f = Files; f; f = f->f_next) {
+                       for (i = 0; i <= LOG_NFACILITIES; i++)
+                               if (f->f_pmask[i] == NOPRI)
+                                       printf("X ");
+                               else
+                                       printf("%d ", f->f_pmask[i]);
+                       printf("%s: ", TypeNames[f->f_type]);
+                       switch (f->f_type) {
+                       case F_FILE:
+                       case F_TTY:
+                       case F_CONSOLE:
+                               printf("%s", f->f_un.f_fname);
+                               break;
+
+                       case F_FORW:
+                               printf("%s", f->f_un.f_forw.f_hname);
+                               break;
+
+                       case F_USERS:
+                               for (i = 0; i < MAXUNAMES && *f->f_un.f_uname[i]; i++)
+                                       printf("%s, ", f->f_un.f_uname[i]);
+                               break;
+                       }
+                       printf("\n");
+               }
+       }
+
+       logmsg(LOG_SYSLOG|LOG_INFO, "syslogd: restart", LocalHostName, ADDDATE);
+       dprintf("syslogd: restarted\n");
+}
+
+/*
+ * Crack a configuration file line
+ */
+
+struct code {
+       char    *c_name;
+       int     c_val;
+};
+
+struct code    PriNames[] = {
+       "panic",        LOG_EMERG,
+       "emerg",        LOG_EMERG,
+       "alert",        LOG_ALERT,
+       "crit",         LOG_CRIT,
+       "err",          LOG_ERR,
+       "error",        LOG_ERR,
+       "warn",         LOG_WARNING,
+       "warning",      LOG_WARNING,
+       "notice",       LOG_NOTICE,
+       "info",         LOG_INFO,
+       "debug",        LOG_DEBUG,
+       "none",         NOPRI,
+       NULL,           -1
+};
+
+struct code    FacNames[] = {
+       "kern",         LOG_KERN,
+       "user",         LOG_USER,
+       "mail",         LOG_MAIL,
+       "daemon",       LOG_DAEMON,
+       "auth",         LOG_AUTH,
+       "security",     LOG_AUTH,
+       "mark",         LOG_MARK,
+       "syslog",       LOG_SYSLOG,
+       "lpr",          LOG_LPR,
+       "news",         LOG_NEWS,
+       "uucp",         LOG_UUCP,
+       "local0",       LOG_LOCAL0,
+       "local1",       LOG_LOCAL1,
+       "local2",       LOG_LOCAL2,
+       "local3",       LOG_LOCAL3,
+       "local4",       LOG_LOCAL4,
+       "local5",       LOG_LOCAL5,
+       "local6",       LOG_LOCAL6,
+       "local7",       LOG_LOCAL7,
+       NULL,           -1
+};
+
+cfline(line, f)
+       char *line;
+       register struct filed *f;
+{
+       register char *p;
+       register char *q;
+       register int i;
+       char *bp;
+       int pri;
+       struct hostent *hp;
+       char buf[MAXLINE];
+
+       dprintf("cfline(%s)\n", line);
+
+       errno = 0;      /* keep sys_errlist stuff out of logerror messages */
+
+       /* clear out file entry */
+       bzero((char *) f, sizeof *f);
+       for (i = 0; i <= LOG_NFACILITIES; i++)
+               f->f_pmask[i] = NOPRI;
+
+       /* scan through the list of selectors */
+       for (p = line; *p && *p != '\t';) {
+
+               /* find the end of this facility name list */
+               for (q = p; *q && *q != '\t' && *q++ != '.'; )
+                       continue;
+
+               /* collect priority name */
+               for (bp = buf; *q && !index("\t,;", *q); )
+                       *bp++ = *q++;
+               *bp = '\0';
+
+               /* skip cruft */
+               while (index(", ;", *q))
+                       q++;
+
+               /* decode priority name */
+               pri = decode(buf, PriNames);
+               if (pri < 0) {
+                       char xbuf[200];
+
+                       (void) sprintf(xbuf, "unknown priority name \"%s\"", buf);
+                       logerror(xbuf);
+                       return;
+               }
+
+               /* scan facilities */
+               while (*p && !index("\t.;", *p)) {
+                       for (bp = buf; *p && !index("\t,;.", *p); )
+                               *bp++ = *p++;
+                       *bp = '\0';
+                       if (*buf == '*')
+                               for (i = 0; i < LOG_NFACILITIES; i++)
+                                       f->f_pmask[i] = pri;
+                       else {
+                               i = decode(buf, FacNames);
+                               if (i < 0) {
+                                       char xbuf[200];
+
+                                       (void) sprintf(xbuf, "unknown facility name \"%s\"", buf);
+                                       logerror(xbuf);
+                                       return;
+                               }
+                               f->f_pmask[i >> 3] = pri;
+                       }
+                       while (*p == ',' || *p == ' ')
+                               p++;
+               }
+
+               p = q;
+       }
+
+       /* skip to action part */
+       while (*p == '\t')
+               p++;
+
+       switch (*p)
+       {
+       case '@':
+               if (!InetInuse)
+                       break;
+               (void) strcpy(f->f_un.f_forw.f_hname, ++p);
+               hp = gethostbyname(p);
+               if (hp == NULL) {
+                       extern int h_errno, h_nerr;
+                       extern char **h_errlist;
+
+                       logerror((u_int)h_errno < h_nerr ?
+                           h_errlist[h_errno] : "Unknown error");
+                       break;
+               }
+               bzero((char *) &f->f_un.f_forw.f_addr,
+                        sizeof f->f_un.f_forw.f_addr);
+               f->f_un.f_forw.f_addr.sin_family = AF_INET;
+               f->f_un.f_forw.f_addr.sin_port = LogPort;
+               bcopy(hp->h_addr, (char *) &f->f_un.f_forw.f_addr.sin_addr, hp->h_length);
+               f->f_type = F_FORW;
+               break;
+
+       case '/':
+               (void) strcpy(f->f_un.f_fname, p);
+               if ((f->f_file = open(p, O_WRONLY|O_APPEND)) < 0) {
+                       f->f_file = F_UNUSED;
+                       logerror(p);
+                       break;
+               }
+               if (isatty(f->f_file)) {
+                       f->f_type = F_TTY;
+                       untty();
+               }
+               else
+                       f->f_type = F_FILE;
+               if (strcmp(p, ctty) == 0)
+                       f->f_type = F_CONSOLE;
+               break;
+
+       case '*':
+               f->f_type = F_WALL;
+               break;
+
+       default:
+               for (i = 0; i < MAXUNAMES && *p; i++) {
+                       for (q = p; *q && *q != ','; )
+                               q++;
+                       (void) strncpy(f->f_un.f_uname[i], p, UNAMESZ);
+                       if ((q - p) > UNAMESZ)
+                               f->f_un.f_uname[i][UNAMESZ] = '\0';
+                       else
+                               f->f_un.f_uname[i][q - p] = '\0';
+                       while (*q == ',' || *q == ' ')
+                               q++;
+                       p = q;
+               }
+               f->f_type = F_USERS;
+               break;
+       }
+}
+
+
+/*
+ *  Decode a symbolic name to a numeric value
+ */
+
+decode(name, codetab)
+       char *name;
+       struct code *codetab;
+{
+       register struct code *c;
+       register char *p;
+       char buf[40];
+
+       if (isdigit(*name))
+               return (atoi(name));
+
+       (void) strcpy(buf, name);
+       for (p = buf; *p; p++)
+               if (isupper(*p))
+                       *p = tolower(*p);
+       for (c = codetab; c->c_name; c++)
+               if (!strcmp(buf, c->c_name))
+                       return (c->c_val);
+
+       return (-1);
+}