[Msyslog-cvs] syslog/src syslogd.c,1.235,1.236

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13664

Modified Files:
	syslogd.c 
Log Message:
From OpenBSD's CVS commit by Todd Miller

Fix default facility when none is specified (should be LOG_USER,
was LOG_UUCP due to a bug); Javier Kohen


Index: syslogd.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/syslogd.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- syslogd.c	8 Jan 2003 16:02:44 -0000	1.235
+++ syslogd.c	22 Mar 2003 15:41:41 -0000	1.236
@@ -741,9 +741,14 @@
   if (pri &~ (LOG_FACMASK | LOG_PRIMASK)) pri = DEFUPRI;
 
 #ifndef INSECURE_KERNEL_INPUT
-  /* don't allow users to log kernel messages */
-  if (LOG_FAC(pri) == LOG_KERN && !(flags & IMODULE_FLAG_KERN))
-    pri = LOG_MAKEPRI(LOG_USER, LOG_PRI(pri));
+	/*
+	* Don't allow users to log kernel messages.
+	* NOTE: since LOG_KERN == 0 this will also match
+	*       messages with no facility specified.
+	*/
+
+	if (LOG_FAC(pri) == LOG_KERN && !(flags & IMODULE_FLAG_KERN))
+		pri = LOG_USER | LOG_PRI(pri);
 #endif
 
   q = line;