d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring in some fixes from NetBSD and re-hack our syslogd to be option-compatible

Browse Source 
with theirs (change the -I option to -s (but leave -I in for backwards compat.)
Also eliminate an make sane some magic numbers, and fix a small bug where we'd
send to an unopened socket.

Reviewed by:	wollman
Obtained from:	NetBSD
This commit is contained in:
pst 1996-07-22 16:35:50 +00:00
parent 232bec99d4
commit 71d7e65562
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/syslogd/syslogd.8
View File

@ -30,7 +30,7 @@
.\" SUCH DAMAGE. .\" SUCH DAMAGE.
.\" .\"
.\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93 .\" @(#)syslogd.8 8.1 (Berkeley) 6/6/93
.\" $Id: syslogd.8,v 1.2 1995/10/12 17:18:38 wollman Exp $ .\" $Id: syslogd.8,v 1.3 1996/05/20 17:10:03 wollman Exp $
.\" .\"
.Dd October 12, 1995 .Dd October 12, 1995
.Dt SYSLOGD 8 .Dt SYSLOGD 8
@ -59,8 +59,9 @@ into debugging mode. This is probably only of use to developers working on
Specify the pathname of an alternate configuration file; Specify the pathname of an alternate configuration file;
the default is the default is
.Pa /etc/syslog.conf . .Pa /etc/syslog.conf .
.It Fl I .It Fl s
Do not log messages received in UDP packets. Operate in secure mode. Do not open a UDP socket to listen for log message
from remote machines.
.It Fl m .It Fl m
Select the number of minutes between ``mark'' messages; Select the number of minutes between ``mark'' messages;
the default is 20 minutes. the default is 20 minutes.

40
usr.sbin/syslogd/syslogd.c
View File

@ -39,7 +39,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94"; static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
*/ */
static const char rcsid[] = static const char rcsid[] =
"$Id: syslogd.c,v 1.7 1995/10/12 17:18:39 wollman Exp $"; "$Id: syslogd.c,v 1.8 1995/11/14 23:39:39 peter Exp $";
#endif /* not lint */ #endif /* not lint */
/* /*
@ -71,6 +71,7 @@ static const char rcsid[] =
#define DEFUPRI (LOG_USER|LOG_NOTICE) #define DEFUPRI (LOG_USER|LOG_NOTICE)
#define DEFSPRI (LOG_KERN|LOG_CRIT) #define DEFSPRI (LOG_KERN|LOG_CRIT)
#define TIMERINTVL 30 /* interval for checking flush, mark */ #define TIMERINTVL 30 /* interval for checking flush, mark */
#define TTYMSGTIME 1 /* timeout passed to ttymsg */
#include <sys/param.h> #include <sys/param.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -191,6 +192,8 @@ int LogPort; /* port number for INET connections */
int Initialized = 0; /* set when we have initialized ourselves */ int Initialized = 0; /* set when we have initialized ourselves */
int MarkInterval = 20 * 60; /* interval between marks in seconds */ int MarkInterval = 20 * 60; /* interval between marks in seconds */
int MarkSeq = 0; /* mark sequence number */ int MarkSeq = 0; /* mark sequence number */
int SecureMode = 0; /* when true, speak only unix domain socks */
int created_lsock = 0; /* Flag if local socket created */ int created_lsock = 0; /* Flag if local socket created */
char bootfile[MAXLINE+1]; /* booted kernel file */ char bootfile[MAXLINE+1]; /* booted kernel file */
@ -215,15 +218,13 @@ main(argc, argv)
int argc; int argc;
char *argv[]; char *argv[];
{ {
int ch, funix, i, inetm, fklog, klogm, len, noudp; int ch, funix, i, inetm, fklog, klogm, len;
struct sockaddr_un sunx, fromunix; struct sockaddr_un sunx, fromunix;
struct sockaddr_in sin, frominet; struct sockaddr_in sin, frominet;
FILE *fp; FILE *fp;
char *p, line[MSG_BSIZE + 1]; char *p, line[MSG_BSIZE + 1];
noudp = 0; while ((ch = getopt(argc, argv, "dsf:Im:p:")) != EOF)
while ((ch = getopt(argc, argv, "df:Im:p:")) != EOF)
switch(ch) { switch(ch) {
case 'd': /* debug */ case 'd': /* debug */
Debug++; Debug++;
@ -231,15 +232,16 @@ main(argc, argv)
case 'f': /* configuration file */ case 'f': /* configuration file */
ConfFile = optarg; ConfFile = optarg;
break; break;
case 'I': /* disable logging from UDP packets */
noudp = 1;
break;
case 'm': /* mark interval */ case 'm': /* mark interval */
MarkInterval = atoi(optarg) * 60; MarkInterval = atoi(optarg) * 60;
break; break;
case 'p': /* path */ case 'p': /* path */
LogName = optarg; LogName = optarg;
break; break;
case 'I': /* backwards compatible w/FreeBSD */
case 's': /* no network mode */
SecureMode++;
break;
case '?': case '?':
default: default:
usage(); usage();
@ -285,7 +287,11 @@ main(argc, argv)
} else } else
created_lsock = 1; created_lsock = 1;
finet = noudp ? -1 : socket(AF_INET, SOCK_DGRAM, 0); if (!SecureMode)
finet = socket(AF_INET, SOCK_DGRAM, 0);
else
finet = -1;
inetm = 0; inetm = 0;
if (finet >= 0) { if (finet >= 0) {
struct servent *sp; struct servent *sp;
@ -380,7 +386,7 @@ usage()
{ {
fprintf(stderr, fprintf(stderr,
"usage: syslogd [-di] [-f conffile] [-m markinterval]" "usage: syslogd [-ds] [-f conffile] [-m markinterval]"
" [-p logpath]\n"); " [-p logpath]\n");
exit(1); exit(1);
} }
@ -587,12 +593,12 @@ logmsg(pri, msg, from, flags)
if (f->f_prevcount) if (f->f_prevcount)
fprintlog(f, 0, (char *)NULL); fprintlog(f, 0, (char *)NULL);
f->f_repeatcount = 0; f->f_repeatcount = 0;
f->f_prevpri = pri;
(void)strncpy(f->f_lasttime, timestamp, 15); (void)strncpy(f->f_lasttime, timestamp, 15);
(void)strncpy(f->f_prevhost, from, (void)strncpy(f->f_prevhost, from,
sizeof(f->f_prevhost)); sizeof(f->f_prevhost));
if (msglen < MAXSVLINE) { if (msglen < MAXSVLINE) {
f->f_prevlen = msglen; f->f_prevlen = msglen;
f->f_prevpri = pri;
(void)strcpy(f->f_prevline, msg); (void)strcpy(f->f_prevline, msg);
fprintlog(f, flags, (char *)NULL); fprintlog(f, flags, (char *)NULL);
} else { } else {
@ -668,9 +674,10 @@ fprintlog(f, flags, msg)
iov[0].iov_base, iov[4].iov_base); iov[0].iov_base, iov[4].iov_base);
if (l > MAXLINE) if (l > MAXLINE)
l = MAXLINE; l = MAXLINE;
if (sendto(finet, line, l, 0, if ((finet >= 0) &&
(struct sockaddr *)&f->f_un.f_forw.f_addr, (sendto(finet, line, l, 0,
sizeof(f->f_un.f_forw.f_addr)) != l) { (struct sockaddr *)&f->f_un.f_forw.f_addr,
sizeof(f->f_un.f_forw.f_addr)) != l)) {
int e = errno; int e = errno;
(void)close(f->f_file); (void)close(f->f_file);
f->f_type = F_UNUSED; f->f_type = F_UNUSED;
@ -763,7 +770,7 @@ wallmsg(f, iov)
strncpy(line, ut.ut_line, sizeof(ut.ut_line)); strncpy(line, ut.ut_line, sizeof(ut.ut_line));
line[sizeof(ut.ut_line)] = '\0'; line[sizeof(ut.ut_line)] = '\0';
if (f->f_type == F_WALL) { if (f->f_type == F_WALL) {
if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) { if ((p = ttymsg(iov, 6, line, TTYMSGTIME)) != NULL) {
errno = 0; /* already in msg */ errno = 0; /* already in msg */
logerror(p); logerror(p);
} }
@ -775,7 +782,8 @@ wallmsg(f, iov)
break; break;
if (!strncmp(f->f_un.f_uname[i], ut.ut_name, if (!strncmp(f->f_un.f_uname[i], ut.ut_name,
UT_NAMESIZE)) { UT_NAMESIZE)) {
if ((p = ttymsg(iov, 6, line, 60*5)) != NULL) { if ((p = ttymsg(iov, 6, line, TTYMSGTIME))
!= NULL) {
errno = 0; /* already in msg */ errno = 0; /* already in msg */
logerror(p); logerror(p);
} }