View | Details | Raw Unified | Return to bug 21788
Collapse All | Expand All

(-)usr.sbin/syslogd/syslogd.c (-2 / +6 lines)
Lines 268-273 Link Here
268
int	UniquePriority = 0;	/* Only log specified priority? */
268
int	UniquePriority = 0;	/* Only log specified priority? */
269
int	LogFacPri = 0;		/* Put facility and priority in log message: */
269
int	LogFacPri = 0;		/* Put facility and priority in log message: */
270
				/* 0=no, 1=numeric, 2=names */
270
				/* 0=no, 1=numeric, 2=names */
271
int	KeepKernFac = 0;	/* Keep remotely logged kernel facility */
271
272
272
int	allowaddr __P((char *));
273
int	allowaddr __P((char *));
273
void	cfline __P((char *, struct filed *, char *));
274
void	cfline __P((char *, struct filed *, char *));
Lines 310-316 Link Here
310
	pid_t ppid = 1;
311
	pid_t ppid = 1;
311
	socklen_t len;
312
	socklen_t len;
312
313
313
	while ((ch = getopt(argc, argv, "a:dl:f:m:p:nsuv")) != -1)
314
	while ((ch = getopt(argc, argv, "a:dl:f:km:p:nsuv")) != -1)
314
		switch(ch) {
315
		switch(ch) {
315
		case 'd':		/* debug */
316
		case 'd':		/* debug */
316
			Debug++;
317
			Debug++;
Lines 322-327 Link Here
322
		case 'f':		/* configuration file */
323
		case 'f':		/* configuration file */
323
			ConfFile = optarg;
324
			ConfFile = optarg;
324
			break;
325
			break;
326
		case 'k':		/* keep remote kern fac */
327
			KeepKernFac = 1;
328
			break;
325
		case 'm':		/* mark interval */
329
		case 'm':		/* mark interval */
326
			MarkInterval = atoi(optarg) * 60;
330
			MarkInterval = atoi(optarg) * 60;
327
			break;
331
			break;
Lines 579-585 Link Here
579
		pri = DEFUPRI;
583
		pri = DEFUPRI;
580
584
581
	/* don't allow users to log kernel messages */
585
	/* don't allow users to log kernel messages */
582
	if (LOG_FAC(pri) == LOG_KERN)
586
	if (KeepKernFac == 0 && LOG_FAC(pri) == LOG_KERN)
583
		pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
587
		pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
584
588
585
	q = line;
589
	q = line;
(-)usr.sbin/syslogd/syslogd.8 (-1 / +4 lines)
Lines 40-46 Link Here
40
.Nd log systems messages
40
.Nd log systems messages
41
.Sh SYNOPSIS
41
.Sh SYNOPSIS
42
.Nm
42
.Nm
43
.Op Fl dsuv
43
.Op Fl dksuv
44
.Op Fl a Ar allowed_peer
44
.Op Fl a Ar allowed_peer
45
.Op Fl f Ar config_file
45
.Op Fl f Ar config_file
46
.Op Fl m Ar mark_interval
46
.Op Fl m Ar mark_interval
Lines 112-117 Link Here
112
Specify the pathname of an alternate configuration file;
112
Specify the pathname of an alternate configuration file;
113
the default is
113
the default is
114
.Pa /etc/syslog.conf .
114
.Pa /etc/syslog.conf .
115
.It Fl k
116
Don't turn messages logged from remote machines with facility kern into
117
facility user.
115
.It Fl m
118
.It Fl m
116
Select the number of minutes between
119
Select the number of minutes between
117
.Dq mark
120
.Dq mark

Return to bug 21788