Attachment 10959 Details for Bug 21788 – file.diff

[patch] file.diff

file.diff (text/plain), 1.68 KB, created by Andre Albsmeier on 2000-10-06 20:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Albsmeier

Created: 2000-10-06 20:50:01 UTC

Size: 1.68 KB

patch

obsolete

>--- usr.sbin/syslogd/syslogd.c.ORI	Mon Aug  7 16:02:10 2000
>+++ usr.sbin/syslogd/syslogd.c	Mon Sep 25 15:16:12 2000
>@@ -268,6 +268,7 @@
> int	UniquePriority = 0;	/* Only log specified priority? */
> int	LogFacPri = 0;		/* Put facility and priority in log message: */
> 				/* 0=no, 1=numeric, 2=names */
>+int	KeepKernFac = 0;	/* Keep remotely logged kernel facility */
> 
> int	allowaddr __P((char *));
> void	cfline __P((char *, struct filed *, char *));
>@@ -310,7 +311,7 @@
> 	pid_t ppid = 1;
> 	socklen_t len;
> 
>-	while ((ch = getopt(argc, argv, "a:dl:f:m:p:nsuv")) != -1)
>+	while ((ch = getopt(argc, argv, "a:dl:f:km:p:nsuv")) != -1)
> 		switch(ch) {
> 		case 'd':		/* debug */
> 			Debug++;
>@@ -322,6 +323,9 @@
> 		case 'f':		/* configuration file */
> 			ConfFile = optarg;
> 			break;
>+		case 'k':		/* keep remote kern fac */
>+			KeepKernFac = 1;
>+			break;
> 		case 'm':		/* mark interval */
> 			MarkInterval = atoi(optarg) * 60;
> 			break;
>@@ -579,7 +583,7 @@
> 		pri = DEFUPRI;
> 
> 	/* don't allow users to log kernel messages */
>-	if (LOG_FAC(pri) == LOG_KERN)
>+	if (KeepKernFac == 0 && LOG_FAC(pri) == LOG_KERN)
> 		pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
> 
> 	q = line;
>--- usr.sbin/syslogd/syslogd.8.ORI	Mon Sep 25 15:17:47 2000
>+++ usr.sbin/syslogd/syslogd.8	Mon Sep 25 15:24:03 2000
>@@ -40,7 +40,7 @@
> .Nd log systems messages
> .Sh SYNOPSIS
> .Nm
>-.Op Fl dsuv
>+.Op Fl dksuv
> .Op Fl a Ar allowed_peer
> .Op Fl f Ar config_file
> .Op Fl m Ar mark_interval
>@@ -112,6 +112,9 @@
> Specify the pathname of an alternate configuration file;
> the default is
> .Pa /etc/syslog.conf .
>+.It Fl k
>+Don't turn messages logged from remote machines with facility kern into
>+facility user.
> .It Fl m
> Select the number of minutes between
> .Dq mark

Actions: View | Diff

Attachments on bug 21788: 10959