mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-29 00:01:12 +00:00
misc: syslog: Move SYSLOG_NAME to USE_MISC (BZ #16355)
There is no easy solution as described on first comment in bug report, and some code (like busybox) assumes facilitynames existance when SYSLOG_NAMES is defined (so we can't just remove it as suggested in comment #2). So use the easier solution and guard it with __USE_MISC.
This commit is contained in:
parent
a583b6add4
commit
cac6b54ae2
@ -62,7 +62,7 @@
|
|||||||
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
|
#define LOG_PRI(p) ((p) & LOG_PRIMASK)
|
||||||
#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
|
#define LOG_MAKEPRI(fac, pri) ((fac) | (pri))
|
||||||
|
|
||||||
#ifdef SYSLOG_NAMES
|
#if defined SYSLOG_NAMES && defined __USE_MISC
|
||||||
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
|
#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */
|
||||||
/* mark "facility" */
|
/* mark "facility" */
|
||||||
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
|
#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES << 3, 0)
|
||||||
@ -118,7 +118,7 @@ CODE prioritynames[] =
|
|||||||
/* facility of pri */
|
/* facility of pri */
|
||||||
#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
|
#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3)
|
||||||
|
|
||||||
#ifdef SYSLOG_NAMES
|
#if defined SYSLOG_NAMES && defined __USE_MISC
|
||||||
CODE facilitynames[] =
|
CODE facilitynames[] =
|
||||||
{
|
{
|
||||||
{ "auth", LOG_AUTH },
|
{ "auth", LOG_AUTH },
|
||||||
|
Loading…
Reference in New Issue
Block a user