AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: syslog: Fix calls to openlog() with LOG_KERN facility (BZ #3604)

Browse Source 
POSIX states for syslog [1]:

  "Values of the priority argument are formed by OR'ing together a
  severity-level value and an optional facility value. If no
  facility value is specified, the current default facility value is
  used."

So the patch fixes an existing violation of the openlog interface contract
where it is ignoring the facility argument when the value is zero

It allows the use LOG_KERN by calling openlog prior syslog usage.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
This commit is contained in:
Dan Raymond 2021-04-13 10:26:12 -03:00 committed by Adhemerval Zanella
parent 58137d00ba
commit f2913118cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/syslog.c
View File

@ -285,7 +285,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
/* Get connected, output the message to the local logger. */
if (!connected)
openlog_internal(LogTag, LogStat | LOG_NDELAY, 0);
openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);
/* If we have a SOCK_STREAM connection, also send ASCII NUL as
a record terminator. */
@ -299,7 +299,7 @@ __vsyslog_internal(int pri, const char *fmt, va_list ap,
/* Try to reopen the syslog connection. Maybe it went
down. */
closelog_internal ();
openlog_internal(LogTag, LogStat | LOG_NDELAY, 0);
openlog_internal(NULL, LogStat | LOG_NDELAY, LogFacility);
}
if (!connected || __send(LogFile, buf, bufsize, send_flags) < 0)
@ -343,7 +343,7 @@ openlog_internal(const char *ident, int logstat, int logfac)
if (ident != NULL)
LogTag = ident;
LogStat = logstat;
if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
if ((logfac &~ LOG_FACMASK) == 0)
LogFacility = logfac;
int retry = 0;