BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / syslog.c

diff --git a/usr/src/lib/libc/gen/syslog.c b/usr/src/lib/libc/gen/syslog.c
index f3d2c5d..59212a7 100644 (file)
--- a/usr/src/lib/libc/gen/syslog.c
+++ b/usr/src/lib/libc/gen/syslog.c
@@ -2,11 +2,37 @@
  * Copyright (c) 1983, 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983, 1988 Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)syslog.c   5.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)syslog.c   5.34 (Berkeley) 6/26/91";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -32,6 +58,7 @@ static int    connected;              /* have done connect */
 static int     LogStat = 0;            /* status bits, set by openlog() */
 static const char *LogTag = "syslog";  /* string to tag the entry with */
 static int     LogFacility = LOG_USER; /* default facility code */
 static int     LogStat = 0;            /* status bits, set by openlog() */
 static const char *LogTag = "syslog";  /* string to tag the entry with */
 static int     LogFacility = LOG_USER; /* default facility code */

+static int     LogMask = 0xff;         /* mask of priorities to be logged */

 
 /*
  * syslog, vsyslog --
 
 /*
  * syslog, vsyslog --


@@ -71,7 +98,8 @@ vsyslog(pri, fmt, ap)
        char tbuf[2048], fmt_cpy[1024], *stdp, *ctime();
 
        /* check for invalid bits or no priority set */
        char tbuf[2048], fmt_cpy[1024], *stdp, *ctime();
 
        /* check for invalid bits or no priority set */

-       if (!LOG_PRI(pri) || (pri &~ (LOG_PRIMASK|LOG_FACMASK)))
+       if (!LOG_PRI(pri) || (pri &~ (LOG_PRIMASK|LOG_FACMASK)) ||
+           !(LOG_MASK(pri) & LogMask))

                return;
 
        saved_errno = errno;
                return;
 
        saved_errno = errno;


@@ -195,8 +223,6 @@ closelog()
        connected = 0;
 }
 
        connected = 0;
 }
 

-static int     LogMask = 0xff;         /* mask of priorities to be logged */
-

 /* setlogmask -- set the log mask level */
 setlogmask(pmask)
        int pmask;
 /* setlogmask -- set the log mask level */
 setlogmask(pmask)
        int pmask;