This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

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

diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 59212a7..09d8ae8 100644 (file)
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -32,26 +32,28 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)syslog.c   5.34 (Berkeley) 6/26/91";
+static char sccsid[] = "@(#)syslog.c   5.36 (Berkeley) 10/4/92";

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

-#include <sys/file.h>

 #include <sys/syslog.h>
 #include <sys/uio.h>
 #include <sys/syslog.h>
 #include <sys/uio.h>

-#include <sys/errno.h>

 #include <netdb.h>
 #include <netdb.h>

+
+#include <errno.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <stdio.h>

 #include <string.h>
 #include <string.h>

+#include <time.h>
+#include <unistd.h>
+

 #if __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 #if __STDC__
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif

-#include <time.h>
-#include <unistd.h>
-#include <paths.h>
-#include <stdio.h>

 
 static int     LogFile = -1;           /* fd for log */
 static int     connected;              /* have done connect */
 
 static int     LogFile = -1;           /* fd for log */
 static int     connected;              /* have done connect */


@@ -93,13 +95,20 @@ vsyslog(pri, fmt, ap)
 {
        register int cnt;
        register char *p;
 {
        register int cnt;
        register char *p;

-       time_t now, time();
+       time_t now;

        int fd, saved_errno;
        int fd, saved_errno;

-       char tbuf[2048], fmt_cpy[1024], *stdp, *ctime();
+       char *stdp, tbuf[2048], fmt_cpy[1024];
+
+#define        INTERNALLOG     LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
+       /* Check for invalid bits. */
+       if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
+               syslog(INTERNALLOG,
+                   "syslog: unknown facility/priority: %x", pri);
+               pri &= LOG_PRIMASK|LOG_FACMASK;
+       }

 
 

-       /* check for invalid bits or no priority set */
-       if (!LOG_PRI(pri) || (pri &~ (LOG_PRIMASK|LOG_FACMASK)) ||
-           !(LOG_MASK(pri) & LogMask))
+       /* Check priority against setlogmask values. */
+       if (!LOG_MASK(LOG_PRI(pri)) & LogMask)

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


@@ -224,6 +233,7 @@ closelog()
 }
 
 /* setlogmask -- set the log mask level */
 }
 
 /* setlogmask -- set the log mask level */

+int

 setlogmask(pmask)
        int pmask;
 {
 setlogmask(pmask)
        int pmask;
 {