diff options
| -rw-r--r-- | exception_lists/check_rtime | 1 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/syslog.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime index 1d33e1617d..27374a9369 100644 --- a/exception_lists/check_rtime +++ b/exception_lists/check_rtime @@ -74,7 +74,6 @@ SKIP ^opt/libc-tests/tests/stdio/ # Objects that are allowed to have executable data segments EXEC_DATA ^MACH(lib)/ld\.so\.1$ EXEC_DATA ^lib/libc\.so\.1$ # 6524709, 32-bit, needed for x86 only -EXEC_DATA ^MACH(lib)/libumem\.so\.1$ # ptcumem EXEC_DATA ^opt/SUNWdtrt/tst/.*/ustack/tst\.helper\.exe$ EXEC_DATA ^platform/.*/MACH(kernel)/unix$ diff --git a/usr/src/lib/libc/port/gen/syslog.c b/usr/src/lib/libc/port/gen/syslog.c index 9c4e7b9443..99c2be2030 100644 --- a/usr/src/lib/libc/port/gen/syslog.c +++ b/usr/src/lib/libc/port/gen/syslog.c @@ -25,7 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* * University Copyright- Copyright (c) 1982, 1986, 1988 @@ -86,10 +86,10 @@ #define PRIMASK(p) (1 << ((p) & LOG_PRIMASK)) #define PRIFAC(p) (((p) & LOG_FACMASK) >> 3) -#define IMPORTANT LOG_ERR +#define IMPORTANT LOG_ERR #ifndef FALSE -#define FALSE 0 +#define FALSE 0 #endif #ifndef TRUE @@ -190,6 +190,7 @@ vsyslog(int pri, const char *fmt, va_list ap) uint32_t msgid; char *msgid_start, *msgid_end; int nowait; + int ret; /* * Maximum tag length is 256 (the pad in outline) minus the size of the @@ -338,10 +339,11 @@ vsyslog(int pri, const char *fmt, va_list ap) dat.buf = outline; /* output the message to the local logger */ - if ((putmsg(LogFile, &ctl, &dat, 0) >= 0) && syslogd_ok()) - return; + ret = putmsg(LogFile, &ctl, &dat, 0); if (!(LogStat & LOG_CONS)) return; + if ((ret >= 0) && syslogd_ok()) + return; /* * Output the message to the console directly. To reduce visual |