X-Git-Url: https://git.saurik.com/apple/network_cmds.git/blobdiff_plain/7ba0088d6898d7fd2873f736f1f556673a8be855..d5fe66bd4c9ef1a4f8b498bf03dee22c15508571:/syslogd.tproj/syslogd.c diff --git a/syslogd.tproj/syslogd.c b/syslogd.tproj/syslogd.c index 7de133b..e92625b 100644 --- a/syslogd.tproj/syslogd.c +++ b/syslogd.tproj/syslogd.c @@ -1,26 +1,3 @@ -/* - * Copyright (c) 1999 Apple Computer, Inc. All rights reserved. - * - * @APPLE_LICENSE_HEADER_START@ - * - * "Portions Copyright (c) 1999 Apple Computer, Inc. All Rights - * Reserved. This file contains Original Code and/or Modifications of - * Original Code as defined in and that are subject to the Apple Public - * Source License Version 1.0 (the 'License'). You may not use this file - * except in compliance with the License. Please obtain a copy of the - * License at http://www.apple.com/publicsource and read it before using - * this file. - * - * The Original Code and all software distributed under the License are - * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER - * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, - * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License." - * - * @APPLE_LICENSE_HEADER_END@ - */ /* * Copyright (c) 1983, 1988, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -55,13 +32,15 @@ */ #ifndef lint -static char copyright[] = +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 #endif /* not lint */ /* @@ -84,6 +63,10 @@ static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; * Author: Eric Allman * extensive changes by Ralph Campbell * more extensive changes by Eric Allman (again) + * Extension to log by program name as well as facility and priority + * by Peter da Silva. + * -u and -v by Harlan Stenn. + * Priority comparison code by Harlan Stenn. */ #define MAXLINE 1024 /* maximum line length */ @@ -91,48 +74,66 @@ static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; #define DEFUPRI (LOG_USER|LOG_NOTICE) #define DEFSPRI (LOG_KERN|LOG_CRIT) #define TIMERINTVL 30 /* interval for checking flush, mark */ +#define TTYMSGTIME 1 /* timed out passed to ttymsg */ #include #include #include #include #include -#include +#include #include #include #include #include +#include +#include #include #include #include #include +#include #include #include -#include +#include +#include #include #include #include #include +#include #include #include +#include + #include "pathnames.h" +#include "ttymsg.h" #define SYSLOG_NAMES #include -char *LogName = _PATH_LOG; -char *ConfFile = _PATH_LOGCONF; -char *PidFile = _PATH_LOGPID; -char ctty[] = _PATH_CONSOLE; +#ifdef NI_WITHSCOPEID +static const int withscopeid = NI_WITHSCOPEID; +#else +static const int withscopeid; +#endif -#define FDMASK(fd) (1 << (fd)) +const char *ConfFile = _PATH_LOGCONF; +const char *PidFile = _PATH_LOGPID; +const char ctty[] = _PATH_CONSOLE; #define dprintf if (Debug) printf #define MAXUNAMES 20 /* maximum number of user names */ +#define MAXFUNIX 20 + +int nfunix = 1; +const char *funixn[MAXFUNIX] = { _PATH_LOG }; +int funix[MAXFUNIX]; + /* * Flags to logmsg(). */ @@ -141,6 +142,7 @@ char ctty[] = _PATH_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 */ +#define ISKERNEL 0x010 /* kernel generated message */ /* * This structure represents the files that will have log @@ -152,24 +154,79 @@ struct filed { short f_type; /* entry type, see below */ short f_file; /* file descriptor */ time_t f_time; /* time this was last written */ + char *f_host; /* host from which to recd. */ u_char f_pmask[LOG_NFACILITIES+1]; /* priority mask */ + u_char f_pcmp[LOG_NFACILITIES+1]; /* compare priority */ +#define PRI_LT 0x1 +#define PRI_EQ 0x2 +#define PRI_GT 0x4 + char *f_program; /* program this applies to */ union { char f_uname[MAXUNAMES][UT_NAMESIZE+1]; struct { - char f_hname[MAXHOSTNAMELEN+1]; - struct sockaddr_in f_addr; + char f_hname[MAXHOSTNAMELEN]; + struct addrinfo *f_addr; + } f_forw; /* forwarding address */ char f_fname[MAXPATHLEN]; + struct { + char f_pname[MAXPATHLEN]; + pid_t f_pid; + } f_pipe; } 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. */ + char f_prevhost[MAXHOSTNAMELEN]; /* 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 */ + u_int f_repeatcount; /* number of "repeated" msgs */ +}; + +/* + * Queue of about-to-be dead processes we should watch out for. + */ + +TAILQ_HEAD(stailhead, deadq_entry) deadq_head; +struct stailhead *deadq_headp; + +struct deadq_entry { + pid_t dq_pid; + int dq_timeout; + TAILQ_ENTRY(deadq_entry) dq_entries; +}; + +/* + * The timeout to apply to processes waiting on the dead queue. Unit + * of measure is `mark intervals', i.e. 20 minutes by default. + * Processes on the dead queue will be terminated after that time. + */ + +#define DQ_TIMO_INIT 2 + +typedef struct deadq_entry *dq_t; + + +/* + * Struct to hold records of network addresses that are allowed to log + * to us. + */ +struct allowedpeer { + int isnumeric; + u_short port; + union { + struct { + struct sockaddr_storage addr; + struct sockaddr_storage mask; + } numeric; + char *name; + } u; +#define a_addr u.numeric.addr +#define a_mask u.numeric.mask +#define a_name u.name }; + /* * Intervals at which we flush out "message repeated" messages, * in seconds after previous message is logged. After each flush, @@ -190,78 +247,165 @@ int repeatinterval[] = { 30, 120, 600 }; /* # of secs before flush */ #define F_FORW 4 /* remote machine */ #define F_USERS 5 /* list of users */ #define F_WALL 6 /* everyone logged on */ +#define F_PIPE 7 /* pipe to program */ +#define F_CHECKTTY 8 /* think it's a tty, so check */ -char *TypeNames[7] = { +const char *TypeNames[9] = { "UNUSED", "FILE", "TTY", "CONSOLE", - "FORW", "USERS", "WALL" + "FORW", "USERS", "WALL", "PIPE", + "CHECKTTY" }; -struct filed *Files; -struct filed consfile; - -int Debug = 0; /* debug flag */ -int Insecure = 0; /* insecure flag */ -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 */ -int NoAddressToName = 0; /* Do not convert address to name */ -int RcvSockBufSize = 42080; /* Our default receive socket buffer size */ - -void cfline __P((char *, struct filed *)); -char *cvthname __P((struct sockaddr_in *)); -int decode __P((const char *, CODE *)); -void die __P((int)); -void domark __P((int)); -void fprintlog __P((struct filed *, int, char *)); -void init __P((int)); -void logerror __P((char *)); -void logmsg __P((int, char *, char *, int)); -void printline __P((char *, char *)); -void printsys __P((char *)); -void reapchild __P((int)); -char *ttymsg __P((struct iovec *, int, char *, int)); -void usage __P((void)); -void wallmsg __P((struct filed *, struct iovec *)); +static struct filed *Files = NULL; /* Log files that we write to */ +static struct filed consfile; /* Console */ + +static int Debug = 0; /* debug flag */ +static int resolve = 1; /* resolve hostname */ +static char LocalHostName[MAXHOSTNAMELEN]; /* our hostname */ +static char *LocalDomain = NULL; /* our local domain name */ +static int *finet = NULL; /* Internet datagram socket */ +static int fklog = -1; /* /dev/klog */ +static int Initialized = 0; /* set when we have initialized ourselves */ +static int MarkInterval = 20 * 60; /* interval between marks in seconds */ +static int MarkSeq = 0; /* mark sequence number */ +#ifdef __APPLE__ +static int RcvSockBufSize = 49152; /* Our default receive socket buffer size 3301629*/ +#endif +static int SecureMode = 0; /* when true, receive only unix domain socks */ +#ifdef INET6 +static int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both) */ +#else +static int family = PF_INET; /* protocol family (IPv4 only) */ +#endif +static int send_to_all = 0; /* send message to all IPv4/IPv6 addresses */ +static int use_bootfile = 0; /* log entire bootfile for every kern msg */ +static int no_compress = 0; /* don't compress messages (1=pipes, 2=all) */ + +static char bootfile[MAXLINE+1]; /* booted kernel file */ + +struct allowedpeer *AllowedPeers = NULL; /* List of allowed peers */ +static int NumAllowed = 0; /* Number of entries in AllowedPeers */ + +static int UniquePriority = 0; /* Only log specified priority? */ +static int LogFacPri = 0; /* Put facility and priority in log message: */ + /* 0=no, 1=numeric, 2=names */ +static int KeepKernFac = 0; /* Keep remotely logged kernel facility */ +static int create_files = 0; + +volatile sig_atomic_t MarkSet = 0, WantDie = 0; + +static int allowaddr(char *); +static void cfline(const char *, struct filed *, + const char *, const char *); +static const char *cvthname(struct sockaddr *); +static void deadq_enter(pid_t, const char *); +static int deadq_remove(pid_t); +static int decode(const char *, CODE *); +static void die(int); +static void dodie(int); +static void domark(int); +static void fprintlog(struct filed *, int, const char *); +static int *socksetup(int, const char *); +static void init(int); +static void logerror(const char *); +static void logmsg(int, const char *, const char *, int); +static void log_deadchild(pid_t, int, const char *); +static void markit(void); +static int skip_message(const char *, const char *); +static void printline(const char *, char *); +static void printsys(char *); +static int p_open(const char *, pid_t *); +static void readklog(void); +static void reapchild(int); +static void usage(void); +static int validate(struct sockaddr *, const char *); +static void unmapped(struct sockaddr *); +static void wallmsg(struct filed *, struct iovec *); +static int waitdaemon(int, int, int); +static void timedout(int); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { - int ch, funix, i, inetm, fklog, klogm, len; + int ch, i, fdsrmax = 0, l; struct sockaddr_un sunx, fromunix; - struct sockaddr_in sin, frominet; + struct sockaddr_storage frominet; + fd_set *fdsr = NULL; FILE *fp; - char *p, line[MSG_BSIZE + 1]; - - while ((ch = getopt(argc, argv, "duf:m:p:ns:")) != EOF) - switch(ch) { + char line[MAXLINE + 1]; + const char *bindhostname, *hname; + struct timeval tv, *tvp; + struct sigaction sact; + sigset_t mask; + pid_t ppid = 1; + socklen_t len; + + bindhostname = NULL; + while ((ch = getopt(argc, argv, "46ACa:b:cdf:kl:m:nop:P:suv")) != -1) + switch (ch) { + case '4': + family = PF_INET; + break; +#ifdef INET6 + case '6': + family = PF_INET6; + break; +#endif + case 'A': + send_to_all++; + break; + case 'C': + create_files++; + break; + case 'a': /* allow specific network addresses only */ + if (allowaddr(optarg) == -1) + usage(); + break; + case 'b': + bindhostname = optarg; + break; + case 'c': + no_compress++; + break; case 'd': /* debug */ Debug++; break; - case 'u': /* insecure */ - Insecure++; - break; case 'f': /* configuration file */ ConfFile = optarg; break; + case 'k': /* keep remote kern fac */ + KeepKernFac = 1; + break; + case 'l': + if (nfunix < MAXFUNIX) + funixn[nfunix++] = optarg; + else + warnx("out of descriptors, ignoring %s", + optarg); + break; case 'm': /* mark interval */ MarkInterval = atoi(optarg) * 60; break; + case 'n': + resolve = 0; + break; + case 'o': + use_bootfile = 1; + break; case 'p': /* path */ - LogName = optarg; + funixn[0] = optarg; break; - case 'n': - NoAddressToName++; + case 'P': /* path for alt. PID */ + PidFile = optarg; + break; + case 's': /* no network mode */ + SecureMode++; break; - case 's': - if ((len = atoi(optarg)) > 0) - RcvSockBufSize = len; + case 'u': /* only log specified priority */ + UniquePriority++; + break; + case 'v': /* log facility and priority */ + LogFacPri++; break; case '?': default: @@ -270,144 +414,242 @@ main(argc, argv) if ((argc -= optind) != 0) usage(); - if (!Debug) - (void)daemon(0, 0); - else + if (!Debug) { + ppid = waitdaemon(0, 0, 30); + if (ppid < 0) + err(1, "could not become daemon"); + } else { setlinebuf(stdout); + } + + if (NumAllowed) + endservent(); consfile.f_type = F_CONSOLE; - (void)strcpy(consfile.f_un.f_fname, ctty); - (void)gethostname(LocalHostName, sizeof(LocalHostName)); - if ((p = strchr(LocalHostName, '.')) != NULL) { - *p++ = '\0'; - LocalDomain = p; - } 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)strlcpy(consfile.f_un.f_fname, ctty + sizeof _PATH_DEV - 1, + sizeof(consfile.f_un.f_fname)); +#ifdef __APPLE__ + /* We lack getbootfile() 3187949 and 3187947 */ + (void)strlcpy(bootfile, "/mach_kernel", sizeof("/mach_kernel")); +#else + (void)strlcpy(bootfile, getbootfile(), sizeof(bootfile)); +#endif + (void)signal(SIGTERM, dodie); + (void)signal(SIGINT, Debug ? dodie : SIG_IGN); + (void)signal(SIGQUIT, Debug ? dodie : SIG_IGN); + /* + * We don't want the SIGCHLD and SIGHUP handlers to interfere + * with each other; they are likely candidates for being called + * simultaneously (SIGHUP closes pipe descriptor, process dies, + * SIGCHLD happens). + */ + sigemptyset(&mask); + sigaddset(&mask, SIGHUP); + sact.sa_handler = reapchild; + sact.sa_mask = mask; + sact.sa_flags = SA_RESTART; + (void)sigaction(SIGCHLD, &sact, NULL); (void)signal(SIGALRM, domark); + (void)signal(SIGPIPE, SIG_IGN); /* We'll catch EPIPE instead. */ (void)alarm(TIMERINTVL); - (void)unlink(LogName); + + TAILQ_INIT(&deadq_head); #ifndef SUN_LEN #define SUN_LEN(unp) (strlen((unp)->sun_path) + 2) #endif - memset(&sunx, 0, sizeof(sunx)); - sunx.sun_family = AF_UNIX; - (void)strncpy(sunx.sun_path, LogName, sizeof(sunx.sun_path)); - funix = socket(AF_UNIX, SOCK_DGRAM, 0); - if (funix < 0 || - bind(funix, (struct sockaddr *)&sunx, SUN_LEN(&sunx)) < 0 || - chmod(LogName, 0666) < 0) { - (void) snprintf(line, sizeof line, "cannot create %s", LogName); - logerror(line); - dprintf("cannot create %s (%d)\n", LogName, errno); - die(0); - } - if (setsockopt(funix, SOL_SOCKET, SO_RCVBUF, &RcvSockBufSize, sizeof(int)) < 0) - logerror("setsockopt funix"); - finet = socket(AF_INET, SOCK_DGRAM, 0); - inetm = 0; - if (finet >= 0) { - struct servent *sp; - - sp = getservbyname("syslog", "udp"); - if (sp == NULL) { - errno = 0; - logerror("syslog/udp: unknown service"); - die(0); - } - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - sin.sin_port = LogPort = sp->s_port; - if (bind(finet, (struct sockaddr *)&sin, sizeof(sin)) < 0) { - logerror("bind"); - if (!Debug) + for (i = 0; i < nfunix; i++) { + (void)unlink(funixn[i]); + memset(&sunx, 0, sizeof(sunx)); + sunx.sun_family = AF_UNIX; + (void)strlcpy(sunx.sun_path, funixn[i], sizeof(sunx.sun_path)); + funix[i] = socket(AF_UNIX, SOCK_DGRAM, 0); + if (funix[i] < 0 || + bind(funix[i], (struct sockaddr *)&sunx, + SUN_LEN(&sunx)) < 0 || + chmod(funixn[i], 0666) < 0) { + (void)snprintf(line, sizeof line, + "cannot create %s", funixn[i]); + logerror(line); + dprintf("cannot create %s (%d)\n", funixn[i], errno); + if (i == 0) die(0); + } +#ifdef __APPLE__ + if (setsockopt(funix[i], SOL_SOCKET, SO_RCVBUF, &RcvSockBufSize, sizeof(int)) < 0) + logerror("setsockopt funix"); +#endif + } + if (SecureMode <= 1) + finet = socksetup(family, bindhostname); + + if (finet) { + if (SecureMode) { + for (i = 0; i < *finet; i++) { + if (shutdown(finet[i+1], SHUT_RD) < 0) { + logerror("shutdown"); + if (!Debug) + die(0); + } + } } else { - inetm = FDMASK(finet); - InetInuse = 1; + dprintf("listening on inet and/or inet6 socket\n"); } - if (setsockopt(finet, SOL_SOCKET, SO_RCVBUF, &RcvSockBufSize, sizeof(int)) < 0) - logerror("setsockopt finet"); + dprintf("sending on inet and/or inet6 socket\n"); } + if ((fklog = open(_PATH_KLOG, O_RDONLY, 0)) >= 0) - klogm = FDMASK(fklog); - else { + if (fcntl(fklog, F_SETFL, O_NONBLOCK) < 0) + fklog = -1; + if (fklog < 0) dprintf("can't open %s (%d)\n", _PATH_KLOG, errno); - klogm = 0; - } /* tuck my process id away */ fp = fopen(PidFile, "w"); if (fp != NULL) { fprintf(fp, "%d\n", getpid()); - (void) fclose(fp); + (void)fclose(fp); } dprintf("off & running....\n"); init(0); - (void)signal(SIGHUP, init); + /* prevent SIGHUP and SIGCHLD handlers from running in parallel */ + sigemptyset(&mask); + sigaddset(&mask, SIGCHLD); + sact.sa_handler = init; + sact.sa_mask = mask; + sact.sa_flags = SA_RESTART; + (void)sigaction(SIGHUP, &sact, NULL); + + tvp = &tv; + tv.tv_sec = tv.tv_usec = 0; + + if (fklog != -1 && fklog > fdsrmax) + fdsrmax = fklog; + if (finet && !SecureMode) { + for (i = 0; i < *finet; i++) { + if (finet[i+1] != -1 && finet[i+1] > fdsrmax) + fdsrmax = finet[i+1]; + } + } + for (i = 0; i < nfunix; i++) { + if (funix[i] != -1 && funix[i] > fdsrmax) + fdsrmax = funix[i]; + } + + fdsr = (fd_set *)calloc(howmany(fdsrmax+1, NFDBITS), + sizeof(fd_mask)); + if (fdsr == NULL) + errx(1, "calloc fd_set"); for (;;) { - int nfds, readfds = FDMASK(funix) | inetm | klogm; + if (MarkSet) + markit(); + if (WantDie) + die(WantDie); + + bzero(fdsr, howmany(fdsrmax+1, NFDBITS) * + sizeof(fd_mask)); + + if (fklog != -1) + FD_SET(fklog, fdsr); + if (finet && !SecureMode) { + for (i = 0; i < *finet; i++) { + if (finet[i+1] != -1) + FD_SET(finet[i+1], fdsr); + } + } + for (i = 0; i < nfunix; i++) { + if (funix[i] != -1) + FD_SET(funix[i], fdsr); + } - dprintf("readfds = %#x\n", readfds); - nfds = select(20, (fd_set *)&readfds, (fd_set *)NULL, - (fd_set *)NULL, (struct timeval *)NULL); - if (nfds == 0) + i = select(fdsrmax+1, fdsr, NULL, NULL, tvp); + switch (i) { + case 0: + if (tvp) { + tvp = NULL; + if (ppid != 1) + kill(ppid, SIGALRM); + } continue; - if (nfds < 0) { + case -1: if (errno != EINTR) logerror("select"); continue; } - 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 (fklog != -1 && FD_ISSET(fklog, fdsr)) + readklog(); + if (finet && !SecureMode) { + for (i = 0; i < *finet; i++) { + if (FD_ISSET(finet[i+1], fdsr)) { + len = sizeof(frominet); + l = recvfrom(finet[i+1], line, MAXLINE, + 0, (struct sockaddr *)&frominet, + &len); + if (l > 0) { + line[l] = '\0'; + hname = cvthname((struct sockaddr *)&frominet); + unmapped((struct sockaddr *)&frominet); + if (validate((struct sockaddr *)&frominet, hname)) + printline(hname, line); + } else if (l < 0 && errno != EINTR) + logerror("recvfrom inet"); + } } } - if (readfds & FDMASK(funix)) { - len = sizeof(fromunix); - 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, - (struct sockaddr *)&frominet, &len); - if (Insecure) { - if (i > 0) { - line[i] = '\0'; - printline(cvthname(&frominet), line); - } else if (i < 0 && errno != EINTR) - logerror("recvfrom inet"); + for (i = 0; i < nfunix; i++) { + if (funix[i] != -1 && FD_ISSET(funix[i], fdsr)) { + len = sizeof(fromunix); + l = recvfrom(funix[i], line, MAXLINE, 0, + (struct sockaddr *)&fromunix, &len); + if (l > 0) { + line[l] = '\0'; + printline(LocalHostName, line); + } else if (l < 0 && errno != EINTR) + logerror("recvfrom unix"); } - } + } } + if (fdsr) + free(fdsr); +} + +static void +unmapped(struct sockaddr *sa) +{ + struct sockaddr_in6 *sin6; + struct sockaddr_in sin4; + + if (sa->sa_family != AF_INET6) + return; + if (sa->sa_len != sizeof(struct sockaddr_in6) || + sizeof(sin4) > sa->sa_len) + return; + sin6 = (struct sockaddr_in6 *)sa; + if (!IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) + return; + + memset(&sin4, 0, sizeof(sin4)); + sin4.sin_family = AF_INET; + sin4.sin_len = sizeof(struct sockaddr_in); + memcpy(&sin4.sin_addr, &sin6->sin6_addr.s6_addr[12], + sizeof(sin4.sin_addr)); + sin4.sin_port = sin6->sin6_port; + + memcpy(sa, &sin4, sin4.sin_len); } -void -usage() +static void +usage(void) { - (void)fprintf(stderr, - "usage: syslogd [-f conffile] [-m markinterval] [-p logpath] [-u] [-n] [-s size]\n"); + fprintf(stderr, "%s\n%s\n%s\n%s\n", + "usage: syslogd [-46Acdknosuv] [-a allowed_peer]", + " [-b bind address] [-f config_file]", + " [-l log_socket] [-m mark_interval]", + " [-P pid_file] [-p log_socket]"); exit(1); } @@ -415,10 +657,8 @@ usage() * Take a raw input line, decode the message, and print the message * on the appropriate log files. */ -void -printline(hname, msg) - char *hname; - char *msg; +static void +printline(const char *hname, char *msg) { int c, pri; char *p, *q, line[MAXLINE + 1]; @@ -437,25 +677,35 @@ printline(hname, msg) pri = DEFUPRI; /* don't allow users to log kernel messages */ - if (LOG_FAC(pri) == LOG_KERN) + if (LOG_FAC(pri) == LOG_KERN && !KeepKernFac) pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri)); q = line; - while ((c = *p++) != '\0' && - q < &line[sizeof(line) - 2]) { - c &= 0177; - if (iscntrl(c)) - if (c == '\n') + while ((c = (unsigned char)*p++) != '\0' && + q < &line[sizeof(line) - 4]) { +#ifdef __APPLE__ + /* Gross installer hack to be removed 3314128 */ + if (LOG_FACMASK&pri != LOG_INSTALL) { + if ((c & 0x80) && c < 0xA0) { + c &= 0x7F; + *q++ = 'M'; + *q++ = '-'; + } + } +#endif + if (isascii(c) && iscntrl(c)) { + if (c == '\n') { *q++ = ' '; - else if (c == '\t') + } else if (c == '\t') { *q++ = '\t'; - else { + } else { *q++ = '^'; *q++ = c ^ 0100; } - else + } else { *q++ = c; + } } *q = '\0'; @@ -463,56 +713,127 @@ printline(hname, msg) } /* - * Take a raw input line from /dev/klog, split and format similar to syslog(). + * Read /dev/klog while data are available, split into lines. */ -void -printsys(msg) - char *msg; +static void +readklog(void) { - int c, pri, flags; - char *lp, *p, *q, line[MAXLINE + 1]; + char *p, *q, line[MAXLINE + 1]; + int len, i; - (void)strcpy(line, "mach_kernel: "); - lp = line + strlen(line); - for (p = msg; *p != '\0'; ) { - 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; + len = 0; + for (;;) { + i = read(fklog, line + len, MAXLINE - 1 - len); + if (i > 0) { + line[i + len] = '\0'; } else { - /* kernel printf's come out on console */ - flags |= IGN_CONS; + if (i < 0 && errno != EINTR && errno != EAGAIN) { + logerror("klog"); + fklog = -1; + } + break; } - if (pri &~ (LOG_FACMASK|LOG_PRIMASK)) - pri = DEFSPRI; - q = lp; - while (*p != '\0' && (c = *p++) != '\n' && - q < &line[MAXLINE]) - *q++ = c; - *q = '\0'; - logmsg(pri, line, LocalHostName, flags); + + for (p = line; (q = strchr(p, '\n')) != NULL; p = q + 1) { + *q = '\0'; + printsys(p); + } + len = strlen(p); + if (len >= MAXLINE - 1) { + printsys(p); + len = 0; + } + if (len > 0) + memmove(line, p, len + 1); + } + if (len > 0) + printsys(line); +} + +/* + * Take a raw input line from /dev/klog, format similar to syslog(). + */ +static void +printsys(char *p) +{ + int pri, flags; + + flags = ISKERNEL | SYNC_FILE | ADDDATE; /* fsync after write */ + pri = DEFSPRI; + if (*p == '<') { + pri = 0; + while (isdigit(*++p)) + pri = 10 * pri + (*p - '0'); + if (*p == '>') + ++p; +#ifndef __APPLE__ + if ((pri & LOG_FACMASK) == LOG_CONSOLE) + flags |= IGN_CONS; +#endif + } else { + /* kernel printf's come out on console */ + flags |= IGN_CONS; } + if (pri &~ (LOG_FACMASK|LOG_PRIMASK)) + pri = DEFSPRI; + logmsg(pri, p, LocalHostName, flags); } -time_t now; +static time_t now; + +/* + * Match a program or host name against a specification. + * Return a non-0 value if the message must be ignored + * based on the specification. + */ +static int +skip_message(const char *name, const char *spec) { + const char *s; + char prev, next; + int exclude = 0; + /* Behaviour on explicit match */ + + if (spec == NULL) + return 0; + switch (*spec) { + case '-': + exclude = 1; + /*FALLTHROUGH*/ + case '+': + spec++; + break; + default: + break; + } + s = strstr (spec, name); + + if (s != NULL) { + prev = (s == spec ? ',' : *(s - 1)); + next = *(s + strlen (name)); + + if (prev == ',' && (next == '\0' || next == ',')) + /* Explicit match: skip iff the spec is an + exclusive one. */ + return exclude; + } + + /* No explicit match for this name: skip the message iff + the spec is an inclusive one. */ + return !exclude; +} /* * Log a message to the appropriate log files, users, etc. based on * the priority. */ -void -logmsg(pri, msg, from, flags) - int pri; - char *msg, *from; - int flags; +static void +logmsg(int pri, const char *msg, const char *from, int flags) { struct filed *f; - int fac, msglen, omask, prilev; - char *timestamp; + int i, fac, msglen, omask, prilev; + const char *timestamp; + char prog[NAME_MAX+1]; + char buf[MAXLINE+1]; dprintf("logmsg: pri %o, flags %x, from %s, msg %s\n", pri, flags, from, msg); @@ -528,14 +849,20 @@ logmsg(pri, msg, from, flags) flags |= ADDDATE; (void)time(&now); - if (flags & ADDDATE) + if (flags & ADDDATE) { timestamp = ctime(&now) + 4; - else { + } else { timestamp = msg; msg += 16; msglen -= 16; } + /* skip leading blanks */ + while (isspace(*msg)) { + msg++; + msglen--; + } + /* extract facility and priority level */ if (flags & MARK) fac = LOG_NFACILITIES; @@ -543,6 +870,22 @@ logmsg(pri, msg, from, flags) fac = LOG_FAC(pri); prilev = LOG_PRI(pri); + /* extract program name */ + for (i = 0; i < NAME_MAX; i++) { + if (!isprint(msg[i]) || msg[i] == ':' || msg[i] == '[') + break; + prog[i] = msg[i]; + } + prog[i] = 0; + + /* add kernel prefix for kernel messages */ + if (flags & ISKERNEL) { + snprintf(buf, sizeof(buf), "%s: %s", + use_bootfile ? bootfile : "kernel", msg); + msg = buf; + msglen = strlen(buf); + } + /* log the message to the particular outputs */ if (!Initialized) { f = &consfile; @@ -557,10 +900,22 @@ logmsg(pri, msg, from, flags) } for (f = Files; f; f = f->f_next) { /* skip messages that are incorrect priority */ - if (f->f_pmask[fac] < prilev || - f->f_pmask[fac] == INTERNAL_NOPRI) + if (!(((f->f_pcmp[fac] & PRI_EQ) && (f->f_pmask[fac] == prilev)) + ||((f->f_pcmp[fac] & PRI_LT) && (f->f_pmask[fac] < prilev)) + ||((f->f_pcmp[fac] & PRI_GT) && (f->f_pmask[fac] > prilev)) + ) + || f->f_pmask[fac] == INTERNAL_NOPRI) + continue; + + /* skip messages with the incorrect hostname */ + if (skip_message(from, f->f_host)) + continue; + + /* skip messages with the incorrect program name */ + if (skip_message(prog, f->f_program)) continue; + /* skip message to console if it has already been printed */ if (f->f_type == F_CONSOLE && (flags & IGN_CONS)) continue; @@ -571,13 +926,14 @@ logmsg(pri, msg, from, flags) /* * suppress duplicate lines to this file */ - if ((flags & MARK) == 0 && msglen == f->f_prevlen && + if (no_compress - (f->f_type != F_PIPE) < 1 && + (flags & MARK) == 0 && msglen == f->f_prevlen && !strcmp(msg, f->f_prevline) && - !strcmp(from, f->f_prevhost)) { - (void)strncpy(f->f_lasttime, timestamp, 15); + !strcasecmp(from, f->f_prevhost)) { + (void)strlcpy(f->f_lasttime, timestamp, 16); f->f_prevcount++; dprintf("msg repeated %d times, %ld sec of %d\n", - f->f_prevcount, now - f->f_time, + f->f_prevcount, (long)(now - f->f_time), repeatinterval[f->f_repeatcount]); /* * If domark would have logged this by now, @@ -594,13 +950,13 @@ logmsg(pri, msg, from, flags) 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)); + f->f_prevpri = pri; + (void)strlcpy(f->f_lasttime, timestamp, 16); + (void)strlcpy(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); + (void)strlcpy(f->f_prevline, msg, sizeof(f->f_prevline)); fprintlog(f, flags, (char *)NULL); } else { f->f_prevline[0] = 0; @@ -612,24 +968,24 @@ logmsg(pri, msg, from, flags) (void)sigsetmask(omask); } -void -fprintlog(f, flags, msg) - struct filed *f; - int flags; - char *msg; +static void +fprintlog(struct filed *f, int flags, const char *msg) { - struct iovec iov[6]; + struct iovec iov[7]; struct iovec *v; - int l; - char line[MAXLINE + 1], repbuf[80], greetings[200]; + struct addrinfo *r; + int i, l, lsent = 0; + char line[MAXLINE + 1], repbuf[80], greetings[200], *wmsg = NULL; + const char *msgret; v = iov; if (f->f_type == F_WALL) { v->iov_base = greetings; - v->iov_len = snprintf(greetings, sizeof greetings, + v->iov_len = snprintf(greetings, sizeof greetings, "\r\n\7Message from syslogd@%s at %.24s ...\r\n", f->f_prevhost, ctime(&now)); - v++; + if (v->iov_len > 0) + v++; v->iov_base = ""; v->iov_len = 0; v++; @@ -641,6 +997,49 @@ fprintlog(f, flags, msg) v->iov_len = 1; v++; } + + if (LogFacPri) { + static char fp_buf[30]; /* Hollow laugh */ + int fac = f->f_prevpri & LOG_FACMASK; + int pri = LOG_PRI(f->f_prevpri); + const char *f_s = NULL; + char f_n[5]; /* Hollow laugh */ + const char *p_s = NULL; + char p_n[5]; /* Hollow laugh */ + + if (LogFacPri > 1) { + CODE *c; + + for (c = facilitynames; c->c_name; c++) { + if (c->c_val == fac) { + f_s = c->c_name; + break; + } + } + for (c = prioritynames; c->c_name; c++) { + if (c->c_val == pri) { + p_s = c->c_name; + break; + } + } + } + if (!f_s) { + snprintf(f_n, sizeof f_n, "%d", LOG_FAC(fac)); + f_s = f_n; + } + if (!p_s) { + snprintf(p_n, sizeof p_n, "%d", pri); + p_s = p_n; + } + snprintf(fp_buf, sizeof fp_buf, "<%s.%s> ", f_s, p_s); + v->iov_base = fp_buf; + v->iov_len = strlen(fp_buf); + } else { + v->iov_base=""; + v->iov_len = 0; + } + v++; + v->iov_base = f->f_prevhost; v->iov_len = strlen(v->iov_base); v++; @@ -649,18 +1048,65 @@ fprintlog(f, flags, msg) v++; if (msg) { - v->iov_base = msg; + wmsg = strdup(msg); /* XXX iov_base needs a `const' sibling. */ + if (wmsg == NULL) { + logerror("strdup"); + exit(1); + } + v->iov_base = wmsg; v->iov_len = strlen(msg); } else if (f->f_prevcount > 1) { v->iov_base = repbuf; - v->iov_len = snprintf(repbuf, sizeof repbuf, "last message repeated %d times", - f->f_prevcount); + v->iov_len = snprintf(repbuf, sizeof repbuf, + "last message repeated %d times", f->f_prevcount); } else { v->iov_base = f->f_prevline; v->iov_len = f->f_prevlen; } v++; + if (f->f_file == -1) { + int oflags = O_WRONLY|O_APPEND; + struct group *gr; + struct stat sb; + int mode = 0640; + int exists = 0; + + if( stat(f->f_un.f_fname, &sb) == 0 ) { + mode = 0; + exists++; + } + if (create_files && !exists) + oflags |= O_CREAT; + if ((f->f_file = open(f->f_un.f_fname, oflags, mode)) < 0) { + f->f_type = F_UNUSED; + /* We can no longer log this error, since calling + * logerror() could bring us back here again. + * Instead, call dprintf(), which will aid in + * debugging, but not cause the looping. + */ + dprintf("Error openning %s", f->f_un.f_fname); + if (msg) free(wmsg); + return; + } + /* Only chown the file if we created it. If it already + * existed, leave whatever was there. + */ + if( !exists ) { + gr = getgrnam("admin"); + if( gr ) + fchown(f->f_file, 0, gr->gr_gid); + if (f->f_type == F_CHECKTTY) { + if (isatty(f->f_file)) { + if (strcmp(f->f_un.f_fname, ctty) == 0) + f->f_type = F_CONSOLE; + else + f->f_type = F_TTY; + } + } + } + } + dprintf("Logging to %s", TypeNames[f->f_type]); f->f_time = now; @@ -671,18 +1117,101 @@ fprintlog(f, flags, msg) case F_FORW: dprintf(" %s\n", f->f_un.f_forw.f_hname); - l = snprintf(line, sizeof line, "<%d>%.15s %s", f->f_prevpri, - iov[0].iov_base, iov[4].iov_base); - if (l > MAXLINE) + /* check for local vs remote messages */ + if (strcasecmp(f->f_prevhost, LocalHostName)) + l = snprintf(line, sizeof line - 1, + "<%d>%.15s Forwarded from %s: %s", + f->f_prevpri, iov[0].iov_base, f->f_prevhost, + iov[5].iov_base); + else + l = snprintf(line, sizeof line - 1, "<%d>%.15s %s", + f->f_prevpri, iov[0].iov_base, iov[5].iov_base); + if (l < 0) + l = 0; + else if (l > MAXLINE) l = MAXLINE; - if (sendto(finet, line, l, 0, - (struct sockaddr *)&f->f_un.f_forw.f_addr, - sizeof(f->f_un.f_forw.f_addr)) != l) { + + if (finet) { + for (r = f->f_un.f_forw.f_addr; r; r = r->ai_next) { + for (i = 0; i < *finet; i++) { +#if 0 + /* + * should we check AF first, or just + * trial and error? FWD + */ + if (r->ai_family == + address_family_of(finet[i+1])) +#endif + lsent = sendto(finet[i+1], line, l, 0, + r->ai_addr, r->ai_addrlen); + if (lsent == l) + break; + } + if (lsent == l && !send_to_all) + break; + } + dprintf("lsent/l: %d/%d\n", lsent, l); + if (lsent != l) { + int e = errno; + logerror("sendto"); + errno = e; + switch (errno) { + case EHOSTUNREACH: + case EHOSTDOWN: + break; + /* case EBADF: */ + /* case EACCES: */ + /* case ENOTSOCK: */ + /* case EFAULT: */ + /* case EMSGSIZE: */ + /* case EAGAIN: */ + /* case ENOBUFS: */ + /* case ECONNREFUSED: */ + default: + dprintf("removing entry\n", e); + (void)close(f->f_file); + f->f_type = F_UNUSED; + break; + } + } + } + break; + + case F_FILE: + dprintf(" %s\n", f->f_un.f_fname); + v->iov_base = "\n"; + v->iov_len = 1; + if (writev(f->f_file, iov, 7) < 0) { int e = errno; (void)close(f->f_file); f->f_type = F_UNUSED; errno = e; - logerror("sendto"); + logerror(f->f_un.f_fname); + } else if (flags & SYNC_FILE) + (void)fsync(f->f_file); + break; + + case F_PIPE: + dprintf(" %s\n", f->f_un.f_pipe.f_pname); + v->iov_base = "\n"; + v->iov_len = 1; + if (f->f_un.f_pipe.f_pid == 0) { + if ((f->f_file = p_open(f->f_un.f_pipe.f_pname, + &f->f_un.f_pipe.f_pid)) < 0) { + f->f_type = F_UNUSED; + logerror(f->f_un.f_pipe.f_pname); + break; + } + } + if (writev(f->f_file, iov, 7) < 0) { + int e = errno; + (void)close(f->f_file); + if (f->f_un.f_pipe.f_pid > 0) + deadq_enter(f->f_un.f_pipe.f_pid, + f->f_un.f_pipe.f_pname); + f->f_un.f_pipe.f_pid = 0; + errno = e; + logerror(f->f_un.f_pipe.f_pname); } break; @@ -694,37 +1223,15 @@ fprintlog(f, flags, msg) /* FALLTHROUGH */ 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; + dprintf(" %s%s\n", _PATH_DEV, f->f_un.f_fname); + v->iov_base = "\r\n"; + v->iov_len = 2; + + errno = 0; /* ttymsg() only sometimes returns an errno */ + if ((msgret = ttymsg(iov, 7, f->f_un.f_fname, 10))) { + f->f_type = F_UNUSED; + logerror(msgret); } - again: - if (writev(f->f_file, iov, 6) < 0) { - int e = errno; - (void)close(f->f_file); - /* - * Check for errors on TTY's due to loss of tty - */ - if ((e == EIO || e == EBADF) && f->f_type != F_FILE) { - f->f_file = open(f->f_un.f_fname, - O_WRONLY|O_APPEND, 0); - if (f->f_file < 0) { - f->f_type = F_UNUSED; - logerror(f->f_un.f_fname); - } else - 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: @@ -736,6 +1243,8 @@ fprintlog(f, flags, msg) break; } f->f_prevcount = 0; + if (msg) + free(wmsg); } /* @@ -744,16 +1253,14 @@ fprintlog(f, flags, msg) * Write the specified message to either the entire * world, or a list of approved users. */ -void -wallmsg(f, iov) - struct filed *f; - struct iovec *iov; +static void +wallmsg(struct filed *f, struct iovec *iov) { static int reenter; /* avoid calling ourselves */ FILE *uf; struct utmp ut; int i; - char *p; + const char *p; char line[sizeof(ut.ut_line) + 1]; if (reenter++) @@ -767,10 +1274,9 @@ wallmsg(f, iov) while (fread((char *)&ut, sizeof(ut), 1, uf) == 1) { if (ut.ut_name[0] == '\0') continue; - strncpy(line, ut.ut_line, sizeof(ut.ut_line)); - line[sizeof(ut.ut_line)] = '\0'; + (void)strlcpy(line, ut.ut_line, sizeof(line)); if (f->f_type == F_WALL) { - if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) { + if ((p = ttymsg(iov, 7, line, TTYMSGTIME)) != NULL) { errno = 0; /* already in msg */ logerror(p); } @@ -782,7 +1288,8 @@ wallmsg(f, iov) break; if (!strncmp(f->f_un.f_uname[i], ut.ut_name, UT_NAMESIZE)) { - if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) { + if ((p = ttymsg(iov, 7, line, TTYMSGTIME)) + != NULL) { errno = 0; /* already in msg */ logerror(p); } @@ -794,129 +1301,175 @@ wallmsg(f, iov) reenter = 0; } -void -reapchild(signo) - int signo; +static void +reapchild(int signo ) { - union wait status; + int status; + pid_t pid; + struct filed *f; - while (wait3((int *)&status, WNOHANG, (struct rusage *)NULL) > 0) - ; + while ((pid = wait3(&status, WNOHANG, (struct rusage *)NULL)) > 0) { + if (!Initialized) + /* Don't tell while we are initting. */ + continue; + + /* First, look if it's a process from the dead queue. */ + if (deadq_remove(pid)) + goto oncemore; + + /* Now, look in list of active processes. */ + for (f = Files; f; f = f->f_next) + if (f->f_type == F_PIPE && + f->f_un.f_pipe.f_pid == pid) { + (void)close(f->f_file); + f->f_un.f_pipe.f_pid = 0; + log_deadchild(pid, status, + f->f_un.f_pipe.f_pname); + break; + } + oncemore: + continue; + } } /* * Return a printable representation of a host address. */ -char * -cvthname(f) - struct sockaddr_in *f; +static const char * +cvthname(struct sockaddr *f) { - struct hostent *hp; + int error; + sigset_t omask, nmask; char *p; + static char hname[NI_MAXHOST], ip[NI_MAXHOST]; - dprintf("cvthname(%s)\n", inet_ntoa(f->sin_addr)); + error = getnameinfo((struct sockaddr *)f, + ((struct sockaddr *)f)->sa_len, + ip, sizeof ip, NULL, 0, + NI_NUMERICHOST | withscopeid); + dprintf("cvthname(%s)\n", ip); - if (f->sin_family != AF_INET) { - dprintf("Malformed from address\n"); + if (error) { + dprintf("Malformed from address %s\n", gai_strerror(error)); return ("???"); } - if (NoAddressToName) { - hp = 0; - } else { - hp = gethostbyaddr((char *)&f->sin_addr, - sizeof(struct in_addr), f->sin_family); - dprintf("Host name for your address (%s) unknown\n", - inet_ntoa(f->sin_addr)); - } - if (hp == 0) - return (inet_ntoa(f->sin_addr)); - - if ((p = strchr(hp->h_name, '.')) && strcmp(p + 1, LocalDomain) == 0) + if (!resolve) + return (ip); + + sigemptyset(&nmask); + sigaddset(&nmask, SIGHUP); + sigprocmask(SIG_BLOCK, &nmask, &omask); + error = getnameinfo((struct sockaddr *)f, + ((struct sockaddr *)f)->sa_len, + hname, sizeof hname, NULL, 0, + NI_NAMEREQD | withscopeid); + sigprocmask(SIG_SETMASK, &omask, NULL); + if (error) { + dprintf("Host name for your address (%s) unknown\n", ip); + return (ip); + } + /* XXX Not quite correct, but close enough for government work. */ + if ((p = strchr(hname, '.')) && strcasecmp(p + 1, LocalDomain) == 0) *p = '\0'; - return (hp->h_name); + return (hname); } -void -domark(signo) - int signo; +static void +dodie(int signo) { - struct filed *f; - now = time((time_t *)NULL); - MarkSeq += TIMERINTVL; - if (MarkSeq >= MarkInterval) { - logmsg(LOG_INFO, "-- MARK --", LocalHostName, ADDDATE|MARK); - MarkSeq = 0; - } + WantDie = signo; +} - 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); +static void +domark(int signo ) +{ + + MarkSet = 1; } /* * Print syslogd errors some place. */ -void -logerror(type) - char *type; +static void +logerror(const char *type) { - char buf[100]; + char buf[512]; if (errno) (void)snprintf(buf, - sizeof(buf), "syslogd: %s: %s", type, strerror(errno)); + sizeof buf, "syslogd: %s: %s", type, strerror(errno)); else - (void)snprintf(buf, sizeof(buf), "syslogd: %s", type); + (void)snprintf(buf, sizeof buf, "syslogd: %s", type); errno = 0; dprintf("%s\n", buf); logmsg(LOG_SYSLOG|LOG_ERR, buf, LocalHostName, ADDDATE); } -void -die(signo) - int signo; +static void +die(int signo) { struct filed *f; + int was_initialized; char buf[100]; + int i; + was_initialized = Initialized; + Initialized = 0; /* Don't log SIGCHLDs. */ for (f = Files; f != NULL; f = f->f_next) { /* flush any pending output */ if (f->f_prevcount) fprintlog(f, 0, (char *)NULL); + if (f->f_type == F_PIPE) + (void)close(f->f_file); } + Initialized = was_initialized; if (signo) { dprintf("syslogd: exiting on signal %d\n", signo); - (void)snprintf(buf, sizeof buf, "exiting on signal %d", signo); + (void)snprintf(buf, sizeof(buf), "exiting on signal %d", signo); errno = 0; logerror(buf); } - (void)unlink(LogName); - exit(0); + for (i = 0; i < nfunix; i++) + if (funixn[i] && funix[i] != -1) + (void)unlink(funixn[i]); + exit(1); } /* * INIT -- Initialize syslogd from configuration table */ -void -init(signo) - int signo; +static void +init(int signo) { int i; FILE *cf; struct filed *f, *next, **nextp; char *p; char cline[LINE_MAX]; + char prog[NAME_MAX+1]; + char host[MAXHOSTNAMELEN]; + char oldLocalHostName[MAXHOSTNAMELEN]; + char hostMsg[2*MAXHOSTNAMELEN+40]; + char bootfileMsg[LINE_MAX]; dprintf("init\n"); + /* + * Load hostname (may have changed). + */ + if (signo != 0) + (void)strlcpy(oldLocalHostName, LocalHostName, + sizeof(oldLocalHostName)); + if (gethostname(LocalHostName, sizeof(LocalHostName))) + err(EX_OSERR, "gethostname() failed"); + if ((p = strchr(LocalHostName, '.')) != NULL) { + *p++ = '\0'; + LocalDomain = p; + } else { + LocalDomain = ""; + } + /* * Close all open log files. */ @@ -928,13 +1481,22 @@ init(signo) switch (f->f_type) { case F_FILE: - case F_TTY: - case F_CONSOLE: case F_FORW: + case F_CONSOLE: + case F_TTY: + (void)close(f->f_file); + break; + case F_PIPE: (void)close(f->f_file); + if (f->f_un.f_pipe.f_pid > 0) + deadq_enter(f->f_un.f_pipe.f_pid, + f->f_un.f_pipe.f_pname); + f->f_un.f_pipe.f_pid = 0; break; } next = f->f_next; + if (f->f_program) free(f->f_program); + if (f->f_host) free(f->f_host); free((char *)f); } Files = NULL; @@ -944,9 +1506,17 @@ init(signo) 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); + if (*nextp == NULL) { + logerror("calloc"); + exit(1); + } + cfline("*.ERR\t/dev/console", *nextp, "*", "*"); (*nextp)->f_next = (struct filed *)calloc(1, sizeof(*f)); - cfline("*.PANIC\t*", (*nextp)->f_next); + if ((*nextp)->f_next == NULL) { + logerror("calloc"); + exit(1); + } + cfline("*.PANIC\t*", (*nextp)->f_next, "*", "*"); Initialized = 1; return; } @@ -955,22 +1525,68 @@ init(signo) * Foreach line in the conf table, open that file. */ f = NULL; + (void)strlcpy(host, "*", sizeof(host)); + (void)strlcpy(prog, "*", sizeof(prog)); while (fgets(cline, sizeof(cline), cf) != NULL) { /* * check for end-of-section, comments, strip off trailing - * spaces and newline character. + * spaces and newline character. #!prog is treated specially: + * following lines apply only to that program. */ for (p = cline; isspace(*p); ++p) continue; - if (*p == NULL || *p == '#') + if (*p == 0) + continue; + if (*p == '#') { + p++; + if (*p != '!' && *p != '+' && *p != '-') + continue; + } + if (*p == '+' || *p == '-') { + host[0] = *p++; + while (isspace(*p)) + p++; + if ((!*p) || (*p == '*')) { + (void)strlcpy(host, "*", sizeof(host)); + continue; + } + if (*p == '@') + p = LocalHostName; + for (i = 1; i < MAXHOSTNAMELEN - 1; i++) { + if (!isalnum(*p) && *p != '.' && *p != '-' + && *p != ',') + break; + host[i] = *p++; + } + host[i] = '\0'; + continue; + } + if (*p == '!') { + p++; + while (isspace(*p)) p++; + if ((!*p) || (*p == '*')) { + (void)strlcpy(prog, "*", sizeof(prog)); + continue; + } + for (i = 0; i < NAME_MAX; i++) { + if (!isprint(p[i])) + break; + prog[i] = p[i]; + } + prog[i] = 0; continue; + } for (p = strchr(cline, '\0'); isspace(*--p);) continue; *++p = '\0'; f = (struct filed *)calloc(1, sizeof(*f)); + if (f == NULL) { + logerror("calloc"); + exit(1); + } *nextp = f; nextp = &f->f_next; - cfline(cline, f); + cfline(cline, f, prog, host); } /* close the configuration file */ @@ -988,42 +1604,70 @@ init(signo) 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_CONSOLE: + case F_TTY: + printf("%s%s", _PATH_DEV, f->f_un.f_fname); + break; + case F_FORW: printf("%s", f->f_un.f_forw.f_hname); break; + case F_PIPE: + printf("%s", f->f_un.f_pipe.f_pname); + 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; } + if (f->f_program) + printf(" (%s)", f->f_program); printf("\n"); } } logmsg(LOG_SYSLOG|LOG_INFO, "syslogd: restart", LocalHostName, ADDDATE); dprintf("syslogd: restarted\n"); + /* + * Log a change in hostname, but only on a restart. + */ + if (signo != 0 && strcmp(oldLocalHostName, LocalHostName) != 0) { + (void)snprintf(hostMsg, sizeof(hostMsg), + "syslogd: hostname changed, \"%s\" to \"%s\"", + oldLocalHostName, LocalHostName); + logmsg(LOG_SYSLOG|LOG_INFO, hostMsg, LocalHostName, ADDDATE); + dprintf("%s\n", hostMsg); + } + /* + * Log the kernel boot file if we aren't going to use it as + * the prefix, and if this is *not* a restart. + */ + if (signo == 0 && !use_bootfile) { + (void)snprintf(bootfileMsg, sizeof(bootfileMsg), + "syslogd: kernel boot file is %s", bootfile); + logmsg(LOG_KERN|LOG_INFO, bootfileMsg, LocalHostName, ADDDATE); + dprintf("%s\n", bootfileMsg); + } } /* * Crack a configuration file line */ -void -cfline(line, f) - char *line; - struct filed *f; +static void +cfline(const char *line, struct filed *f, const char *prog, const char *host) { - struct hostent *hp; - int i, pri; - char *bp, *p, *q; + struct addrinfo hints, *res; + int error, i, pri; + const char *p, *q; + char *bp, *port; char buf[MAXLINE], ebuf[100]; - dprintf("cfline(%s)\n", line); + dprintf("cfline(\"%s\", f, \"%s\", \"%s\")\n", line, prog, host); errno = 0; /* keep strerror() stuff out of logerror messages */ @@ -1032,53 +1676,127 @@ cfline(line, f) for (i = 0; i <= LOG_NFACILITIES; i++) f->f_pmask[i] = INTERNAL_NOPRI; + /* save hostname if any */ + if (host && *host == '*') + host = NULL; + if (host) { + int hl, dl; + + f->f_host = strdup(host); + if (f->f_host == NULL) { + logerror("strdup"); + exit(1); + } + hl = strlen(f->f_host); + if (f->f_host[hl-1] == '.') + f->f_host[--hl] = '\0'; + dl = strlen(LocalDomain) + 1; + if (hl > dl && f->f_host[hl-dl] == '.' && + strcasecmp(f->f_host + hl - dl + 1, LocalDomain) == 0) + f->f_host[hl-dl] = '\0'; + } + + /* save program name if any */ + if (prog && *prog == '*') + prog = NULL; + if (prog) { + f->f_program = strdup(prog); + if (f->f_program == NULL) { + logerror("strdup"); + exit(1); + } + } + /* scan through the list of selectors */ - for (p = line; *p && *p != '\t';) { + for (p = line; *p && *p != '\t' && *p != ' ';) { + int pri_done; + int pri_cmp; + int pri_invert; /* find the end of this facility name list */ - for (q = p; *q && *q != '\t' && *q++ != '.'; ) + for (q = p; *q && *q != '\t' && *q != ' ' && *q++ != '.'; ) continue; + /* get the priority comparison */ + pri_cmp = 0; + pri_done = 0; + pri_invert = 0; + if (*q == '!') { + pri_invert = 1; + q++; + } + while (!pri_done) { + switch (*q) { + case '<': + pri_cmp |= PRI_LT; + q++; + break; + case '=': + pri_cmp |= PRI_EQ; + q++; + break; + case '>': + pri_cmp |= PRI_GT; + q++; + break; + default: + pri_done++; + break; + } + } + /* collect priority name */ - for (bp = buf; *q && !strchr("\t,;", *q); ) + for (bp = buf; *q && !strchr("\t,; ", *q); ) *bp++ = *q++; *bp = '\0'; /* skip cruft */ - while (strchr(", ;", *q)) + while (strchr(",;", *q)) q++; /* decode priority name */ - if (*buf == '*') + if (*buf == '*') { pri = LOG_PRIMASK + 1; - else { + pri_cmp = PRI_LT | PRI_EQ | PRI_GT; + } else { pri = decode(buf, prioritynames); if (pri < 0) { - (void)snprintf(ebuf, sizeof ebuf, + (void)snprintf(ebuf, sizeof ebuf, "unknown priority name \"%s\"", buf); logerror(ebuf); return; } } + if (!pri_cmp) + pri_cmp = (UniquePriority) + ? (PRI_EQ) + : (PRI_EQ | PRI_GT) + ; + if (pri_invert) + pri_cmp ^= PRI_LT | PRI_EQ | PRI_GT; /* scan facilities */ - while (*p && !strchr("\t.;", *p)) { - for (bp = buf; *p && !strchr("\t,;.", *p); ) + while (*p && !strchr("\t.; ", *p)) { + for (bp = buf; *p && !strchr("\t,;. ", *p); ) *bp++ = *p++; *bp = '\0'; - if (*buf == '*') - for (i = 0; i < LOG_NFACILITIES; i++) + + if (*buf == '*') { + for (i = 0; i < LOG_NFACILITIES; i++) { f->f_pmask[i] = pri; - else { + f->f_pcmp[i] = pri_cmp; + } + } else { i = decode(buf, facilitynames); if (i < 0) { - (void)snprintf(ebuf, sizeof ebuf, + (void)snprintf(ebuf, sizeof ebuf, "unknown facility name \"%s\"", buf); logerror(ebuf); return; } f->f_pmask[i >> 3] = pri; + f->f_pcmp[i >> 3] = pri_cmp; } while (*p == ',' || *p == ' ') p++; @@ -1088,43 +1806,42 @@ cfline(line, f) } /* skip to action part */ - while (*p == '\t') + while (*p == '\t' || *p == ' ') p++; - switch (*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; - - logerror(hstrerror(h_errno)); + port = p; + p = strsep(&port, ":"); + (void)strlcpy(f->f_un.f_forw.f_hname, ++p, + sizeof(f->f_un.f_forw.f_hname)); + memset(&hints, 0, sizeof(hints)); + hints.ai_family = family; + hints.ai_socktype = SOCK_DGRAM; + error = getaddrinfo(f->f_un.f_forw.f_hname, port ? port : "syslog", &hints, + &res); + if (error) { + logerror(gai_strerror(error)); break; } - memset(&f->f_un.f_forw.f_addr, 0, - 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; - memmove(&f->f_un.f_forw.f_addr.sin_addr, hp->h_addr, hp->h_length); + f->f_un.f_forw.f_addr = res; 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)) < 0) { - f->f_file = F_UNUSED; - logerror(p); - break; - } - if (isatty(f->f_file)) - f->f_type = F_TTY; + /* Delay opening files until we're ready to log to them */ + f->f_file = -1; + if (strncmp(p, _PATH_DEV, sizeof(_PATH_DEV)) == 0) + f->f_type = F_CHECKTTY; else f->f_type = F_FILE; - if (strcmp(p, ctty) == 0) - f->f_type = F_CONSOLE; + (void)strlcpy(f->f_un.f_fname, p, sizeof(f->f_un.f_fname)); + break; + + case '|': + f->f_un.f_pipe.f_pid = 0; + (void)strlcpy(f->f_un.f_fname, p + 1, sizeof(f->f_un.f_fname)); + f->f_type = F_PIPE; break; case '*': @@ -1153,10 +1870,8 @@ cfline(line, f) /* * Decode a symbolic name to a numeric value */ -int -decode(name, codetab) - const char *name; - CODE *codetab; +static int +decode(const char *name, CODE *codetab) { CODE *c; char *p, buf[40]; @@ -1177,3 +1892,636 @@ decode(name, codetab) return (-1); } + +static void +markit(void) +{ + struct filed *f; + dq_t q, next; + + now = time((time_t *)NULL); + MarkSeq += TIMERINTVL; + if (MarkInterval && (MarkSeq >= MarkInterval)) { + logmsg(LOG_INFO, "-- MARK --", + LocalHostName, ADDDATE|MARK); + MarkSeq = 0; + } + + 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); + } + } + + /* Walk the dead queue, and see if we should signal somebody. */ + for (q = TAILQ_FIRST(&deadq_head); q != NULL; q = next) { + next = TAILQ_NEXT(q, dq_entries); + + switch (q->dq_timeout) { + case 0: + /* Already signalled once, try harder now. */ + if (kill(q->dq_pid, SIGKILL) != 0) + (void)deadq_remove(q->dq_pid); + break; + + case 1: + /* + * Timed out on dead queue, send terminate + * signal. Note that we leave the removal + * from the dead queue to reapchild(), which + * will also log the event (unless the process + * didn't even really exist, in case we simply + * drop it from the dead queue). + */ + if (kill(q->dq_pid, SIGTERM) != 0) + (void)deadq_remove(q->dq_pid); + /* FALLTHROUGH */ + + default: + q->dq_timeout--; + } + } + MarkSet = 0; + (void)alarm(TIMERINTVL); +} + +/* + * fork off and become a daemon, but wait for the child to come online + * before returing to the parent, or we get disk thrashing at boot etc. + * Set a timer so we don't hang forever if it wedges. + */ +static int +waitdaemon(int nochdir, int noclose, int maxwait) +{ + int fd; + int status; + pid_t pid, childpid; + + switch (childpid = fork()) { + case -1: + return (-1); + case 0: + break; + default: + signal(SIGALRM, timedout); + alarm(maxwait); + while ((pid = wait3(&status, 0, NULL)) != -1) { + if (WIFEXITED(status)) + errx(1, "child pid %d exited with return code %d", + pid, WEXITSTATUS(status)); + if (WIFSIGNALED(status)) + errx(1, "child pid %d exited on signal %d%s", + pid, WTERMSIG(status), + WCOREDUMP(status) ? " (core dumped)" : + ""); + if (pid == childpid) /* it's gone... */ + break; + } + exit(0); + } + + if (setsid() == -1) + return (-1); + + if (!nochdir) + (void)chdir("/"); + + if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { + (void)dup2(fd, STDIN_FILENO); + (void)dup2(fd, STDOUT_FILENO); + (void)dup2(fd, STDERR_FILENO); + if (fd > 2) + (void)close (fd); + } + return (getppid()); +} + +/* + * We get a SIGALRM from the child when it's running and finished doing it's + * fsync()'s or O_SYNC writes for all the boot messages. + * + * We also get a signal from the kernel if the timer expires, so check to + * see what happened. + */ +static void +timedout(int sig ) +{ + int left; + left = alarm(0); + signal(SIGALRM, SIG_DFL); + if (left == 0) + errx(1, "timed out waiting for child"); + else + _exit(0); +} + +/* + * Add `s' to the list of allowable peer addresses to accept messages + * from. + * + * `s' is a string in the form: + * + * [*]domainname[:{servicename|portnumber|*}] + * + * or + * + * netaddr/maskbits[:{servicename|portnumber|*}] + * + * Returns -1 on error, 0 if the argument was valid. + */ +static int +allowaddr(char *s) +{ + char *cp1, *cp2; + struct allowedpeer ap; + struct servent *se; + int masklen = -1, i; + struct addrinfo hints, *res; + struct in_addr *addrp, *maskp; + u_int32_t *addr6p, *mask6p; + char ip[NI_MAXHOST]; + +#ifdef INET6 + if (*s != '[' || (cp1 = strchr(s + 1, ']')) == NULL) +#endif + cp1 = s; + if ((cp1 = strrchr(cp1, ':'))) { + /* service/port provided */ + *cp1++ = '\0'; + if (strlen(cp1) == 1 && *cp1 == '*') + /* any port allowed */ + ap.port = 0; + else if ((se = getservbyname(cp1, "udp"))) { + ap.port = ntohs(se->s_port); + } else { + ap.port = strtol(cp1, &cp2, 0); + if (*cp2 != '\0') + return (-1); /* port not numeric */ + } + } else { + if ((se = getservbyname("syslog", "udp"))) + ap.port = ntohs(se->s_port); + else + /* sanity, should not happen */ + ap.port = 514; + } + + if ((cp1 = strchr(s, '/')) != NULL && + strspn(cp1 + 1, "0123456789") == strlen(cp1 + 1)) { + *cp1 = '\0'; + if ((masklen = atoi(cp1 + 1)) < 0) + return (-1); + } +#ifdef INET6 + if (*s == '[') { + cp2 = s + strlen(s) - 1; + if (*cp2 == ']') { + ++s; + *cp2 = '\0'; + } else { + cp2 = NULL; + } + } else { + cp2 = NULL; + } +#endif + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; + if (getaddrinfo(s, NULL, &hints, &res) == 0) { + ap.isnumeric = 1; + memcpy(&ap.a_addr, res->ai_addr, res->ai_addrlen); + memset(&ap.a_mask, 0, sizeof(ap.a_mask)); + ap.a_mask.ss_family = res->ai_family; + if (res->ai_family == AF_INET) { + ap.a_mask.ss_len = sizeof(struct sockaddr_in); + maskp = &((struct sockaddr_in *)&ap.a_mask)->sin_addr; + addrp = &((struct sockaddr_in *)&ap.a_addr)->sin_addr; + if (masklen < 0) { + /* use default netmask */ + if (IN_CLASSA(ntohl(addrp->s_addr))) + maskp->s_addr = htonl(IN_CLASSA_NET); + else if (IN_CLASSB(ntohl(addrp->s_addr))) + maskp->s_addr = htonl(IN_CLASSB_NET); + else + maskp->s_addr = htonl(IN_CLASSC_NET); + } else if (masklen <= 32) { + /* convert masklen to netmask */ + if (masklen == 0) + maskp->s_addr = 0; + else + maskp->s_addr = htonl(~((1 << (32 - masklen)) - 1)); + } else { + freeaddrinfo(res); + return (-1); + } + /* Lose any host bits in the network number. */ + addrp->s_addr &= maskp->s_addr; + } +#ifdef INET6 + else if (res->ai_family == AF_INET6 && masklen <= 128) { + ap.a_mask.ss_len = sizeof(struct sockaddr_in6); + if (masklen < 0) + masklen = 128; + mask6p = (u_int32_t *)&((struct sockaddr_in6 *)&ap.a_mask)->sin6_addr; + /* convert masklen to netmask */ + while (masklen > 0) { + if (masklen < 32) { + *mask6p = htonl(~(0xffffffff >> masklen)); + break; + } + *mask6p++ = 0xffffffff; + masklen -= 32; + } + /* Lose any host bits in the network number. */ + mask6p = (u_int32_t *)&((struct sockaddr_in6 *)&ap.a_mask)->sin6_addr; + addr6p = (u_int32_t *)&((struct sockaddr_in6 *)&ap.a_addr)->sin6_addr; + for (i = 0; i < 4; i++) + addr6p[i] &= mask6p[i]; + } +#endif + else { + freeaddrinfo(res); + return (-1); + } + freeaddrinfo(res); + } else { + /* arg `s' is domain name */ + ap.isnumeric = 0; + ap.a_name = s; + if (cp1) + *cp1 = '/'; +#ifdef INET6 + if (cp2) { + *cp2 = ']'; + --s; + } +#endif + } + + if (Debug) { + printf("allowaddr: rule %d: ", NumAllowed); + if (ap.isnumeric) { + printf("numeric, "); + getnameinfo((struct sockaddr *)&ap.a_addr, + ((struct sockaddr *)&ap.a_addr)->sa_len, + ip, sizeof ip, NULL, 0, + NI_NUMERICHOST | withscopeid); + printf("addr = %s, ", ip); + getnameinfo((struct sockaddr *)&ap.a_mask, + ((struct sockaddr *)&ap.a_mask)->sa_len, + ip, sizeof ip, NULL, 0, + NI_NUMERICHOST | withscopeid); + printf("mask = %s; ", ip); + } else { + printf("domainname = %s; ", ap.a_name); + } + printf("port = %d\n", ap.port); + } + + if ((AllowedPeers = realloc(AllowedPeers, + ++NumAllowed * sizeof(struct allowedpeer))) + == NULL) { + logerror("realloc"); + exit(1); + } + memcpy(&AllowedPeers[NumAllowed - 1], &ap, sizeof(struct allowedpeer)); + return (0); +} + +/* + * Validate that the remote peer has permission to log to us. + */ +static int +validate(struct sockaddr *sa, const char *hname) +{ + int i, j, reject; + size_t l1, l2; + char *cp, name[NI_MAXHOST], ip[NI_MAXHOST], port[NI_MAXSERV]; + struct allowedpeer *ap; + struct sockaddr_in *sin4, *a4p = NULL, *m4p = NULL; + struct sockaddr_in6 *sin6, *a6p = NULL, *m6p = NULL; + struct addrinfo hints, *res; + u_short sport; + + if (NumAllowed == 0) + /* traditional behaviour, allow everything */ + return (1); + + (void)strlcpy(name, hname, sizeof(name)); + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; + if (getaddrinfo(name, NULL, &hints, &res) == 0) + freeaddrinfo(res); + else if (strchr(name, '.') == NULL) { + strlcat(name, ".", sizeof name); + strlcat(name, LocalDomain, sizeof name); + } + if (getnameinfo(sa, sa->sa_len, ip, sizeof ip, port, sizeof port, + NI_NUMERICHOST | withscopeid | NI_NUMERICSERV) != 0) + return (0); /* for safety, should not occur */ + dprintf("validate: dgram from IP %s, port %s, name %s;\n", + ip, port, name); + sport = atoi(port); + + /* now, walk down the list */ + for (i = 0, ap = AllowedPeers; i < NumAllowed; i++, ap++) { + if (ap->port != 0 && ap->port != sport) { + dprintf("rejected in rule %d due to port mismatch.\n", i); + continue; + } + + if (ap->isnumeric) { + if (ap->a_addr.ss_family != sa->sa_family) { + dprintf("rejected in rule %d due to address family mismatch.\n", i); + continue; + } + if (ap->a_addr.ss_family == AF_INET) { + sin4 = (struct sockaddr_in *)sa; + a4p = (struct sockaddr_in *)&ap->a_addr; + m4p = (struct sockaddr_in *)&ap->a_mask; + if ((sin4->sin_addr.s_addr & m4p->sin_addr.s_addr) + != a4p->sin_addr.s_addr) { + dprintf("rejected in rule %d due to IP mismatch.\n", i); + continue; + } + } +#ifdef INET6 + else if (ap->a_addr.ss_family == AF_INET6) { + sin6 = (struct sockaddr_in6 *)sa; + a6p = (struct sockaddr_in6 *)&ap->a_addr; + m6p = (struct sockaddr_in6 *)&ap->a_mask; +#ifdef NI_WITHSCOPEID + if (a6p->sin6_scope_id != 0 && + sin6->sin6_scope_id != a6p->sin6_scope_id) { + dprintf("rejected in rule %d due to scope mismatch.\n", i); + continue; + } +#endif + reject = 0; + for (j = 0; j < 16; j += 4) { + if ((*(u_int32_t *)&sin6->sin6_addr.s6_addr[j] & *(u_int32_t *)&m6p->sin6_addr.s6_addr[j]) + != *(u_int32_t *)&a6p->sin6_addr.s6_addr[j]) { + ++reject; + break; + } + } + if (reject) { + dprintf("rejected in rule %d due to IP mismatch.\n", i); + continue; + } + } +#endif + else + continue; + } else { + cp = ap->a_name; + l1 = strlen(name); + if (*cp == '*') { + /* allow wildmatch */ + cp++; + l2 = strlen(cp); + if (l2 > l1 || memcmp(cp, &name[l1 - l2], l2) != 0) { + dprintf("rejected in rule %d due to name mismatch.\n", i); + continue; + } + } else { + /* exact match */ + l2 = strlen(cp); + if (l2 != l1 || memcmp(cp, name, l1) != 0) { + dprintf("rejected in rule %d due to name mismatch.\n", i); + continue; + } + } + } + dprintf("accepted in rule %d.\n", i); + return (1); /* hooray! */ + } + return (0); +} + +/* + * Fairly similar to popen(3), but returns an open descriptor, as + * opposed to a FILE *. + */ +static int +p_open(const char *prog, pid_t *pid) +{ + int pfd[2], nulldesc, i; + sigset_t omask, mask; + char *argv[4]; /* sh -c cmd NULL */ + char errmsg[200]; + + if (pipe(pfd) == -1) + return (-1); + if ((nulldesc = open(_PATH_DEVNULL, O_RDWR)) == -1) + /* we are royally screwed anyway */ + return (-1); + + sigemptyset(&mask); + sigaddset(&mask, SIGALRM); + sigaddset(&mask, SIGHUP); + sigprocmask(SIG_BLOCK, &mask, &omask); + switch ((*pid = fork())) { + case -1: + sigprocmask(SIG_SETMASK, &omask, 0); + close(nulldesc); + return (-1); + + case 0: + /* XXX should check for NULL return */ + argv[0] = strdup("sh"); + argv[1] = strdup("-c"); + argv[2] = strdup(prog); + argv[3] = NULL; + if (argv[0] == NULL || argv[1] == NULL || argv[2] == NULL) { + logerror("strdup"); + exit(1); + } + + alarm(0); + (void)setsid(); /* Avoid catching SIGHUPs. */ + + /* + * Throw away pending signals, and reset signal + * behaviour to standard values. + */ + signal(SIGALRM, SIG_IGN); + signal(SIGHUP, SIG_IGN); + sigprocmask(SIG_SETMASK, &omask, 0); + signal(SIGPIPE, SIG_DFL); + signal(SIGQUIT, SIG_DFL); + signal(SIGALRM, SIG_DFL); + signal(SIGHUP, SIG_DFL); + + dup2(pfd[0], STDIN_FILENO); + dup2(nulldesc, STDOUT_FILENO); + dup2(nulldesc, STDERR_FILENO); + for (i = getdtablesize(); i > 2; i--) + (void)close(i); + + (void)execvp(_PATH_BSHELL, argv); + _exit(255); + } + + sigprocmask(SIG_SETMASK, &omask, 0); + close(nulldesc); + close(pfd[0]); + /* + * Avoid blocking on a hung pipe. With O_NONBLOCK, we are + * supposed to get an EWOULDBLOCK on writev(2), which is + * caught by the logic above anyway, which will in turn close + * the pipe, and fork a new logging subprocess if necessary. + * The stale subprocess will be killed some time later unless + * it terminated itself due to closing its input pipe (so we + * get rid of really dead puppies). + */ + if (fcntl(pfd[1], F_SETFL, O_NONBLOCK) == -1) { + /* This is bad. */ + (void)snprintf(errmsg, sizeof errmsg, + "Warning: cannot change pipe to PID %d to " + "non-blocking behaviour.", + (int)*pid); + logerror(errmsg); + } + return (pfd[1]); +} + +static void +deadq_enter(pid_t pid, const char *name) +{ + dq_t p; + int status; + + /* + * Be paranoid, if we can't signal the process, don't enter it + * into the dead queue (perhaps it's already dead). If possible, + * we try to fetch and log the child's status. + */ + if (kill(pid, 0) != 0) { + if (waitpid(pid, &status, WNOHANG) > 0) + log_deadchild(pid, status, name); + return; + } + + p = malloc(sizeof(struct deadq_entry)); + if (p == NULL) { + logerror("malloc"); + exit(1); + } + + p->dq_pid = pid; + p->dq_timeout = DQ_TIMO_INIT; + TAILQ_INSERT_TAIL(&deadq_head, p, dq_entries); +} + +static int +deadq_remove(pid_t pid) +{ + dq_t q; + + TAILQ_FOREACH(q, &deadq_head, dq_entries) { + if (q->dq_pid == pid) { + TAILQ_REMOVE(&deadq_head, q, dq_entries); + free(q); + return (1); + } + } + + return (0); +} + +static void +log_deadchild(pid_t pid, int status, const char *name) +{ + int code; + char buf[256]; + const char *reason; + + errno = 0; /* Keep strerror() stuff out of logerror messages. */ + if (WIFSIGNALED(status)) { + reason = "due to signal"; + code = WTERMSIG(status); + } else { + reason = "with status"; + code = WEXITSTATUS(status); + if (code == 0) + return; + } + (void)snprintf(buf, sizeof buf, + "Logging subprocess %d (%s) exited %s %d.", + pid, name, reason, code); + logerror(buf); +} + +static int * +socksetup(int af, const char *bindhostname) +{ + struct addrinfo hints, *res, *r; + int error, maxs, *s, *socks; + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_PASSIVE; + hints.ai_family = af; + hints.ai_socktype = SOCK_DGRAM; + error = getaddrinfo(bindhostname, "syslog", &hints, &res); + if (error) { + logerror(gai_strerror(error)); + errno = 0; + die(0); + } + + /* Count max number of sockets we may open */ + for (maxs = 0, r = res; r; r = r->ai_next, maxs++); + socks = malloc((maxs+1) * sizeof(int)); + if (socks == NULL) { + logerror("couldn't allocate memory for sockets"); + die(0); + } + + *socks = 0; /* num of sockets counter at start of array */ + s = socks + 1; + for (r = res; r; r = r->ai_next) { + *s = socket(r->ai_family, r->ai_socktype, r->ai_protocol); + if (*s < 0) { + logerror("socket"); + continue; + } + if (r->ai_family == AF_INET6) { + int on = 1; + if (setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY, + (char *)&on, sizeof (on)) < 0) { + logerror("setsockopt"); + close(*s); + continue; + } + } + if (bind(*s, r->ai_addr, r->ai_addrlen) < 0) { + close(*s); + logerror("bind"); + continue; + } + + (*socks)++; + s++; + } + + if (*socks == 0) { + free(socks); + if (Debug) + return (NULL); + else + die(0); + } + if (res) + freeaddrinfo(res); + + return (socks); +}