diff options
Diffstat (limited to 'sysklogd/syslogd.c')
-rw-r--r-- | sysklogd/syslogd.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 31730a7f9..4265f4f90 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
@@ -447,7 +447,7 @@ static void parse_syslogdcfg(const char *file) | |||
447 | primap = 0xff; /* all 8 log levels enabled */ | 447 | primap = 0xff; /* all 8 log levels enabled */ |
448 | else { | 448 | else { |
449 | uint8_t priority; | 449 | uint8_t priority; |
450 | code = find_by_name(t, prioritynames); | 450 | code = find_by_name(t, bb_prioritynames); |
451 | if (!code) | 451 | if (!code) |
452 | goto cfgerr; | 452 | goto cfgerr; |
453 | primap = 0; | 453 | primap = 0; |
@@ -480,7 +480,7 @@ static void parse_syslogdcfg(const char *file) | |||
480 | next_facility = strchr(t, ','); | 480 | next_facility = strchr(t, ','); |
481 | if (next_facility) | 481 | if (next_facility) |
482 | *next_facility++ = '\0'; | 482 | *next_facility++ = '\0'; |
483 | code = find_by_name(t, facilitynames); | 483 | code = find_by_name(t, bb_facilitynames); |
484 | if (!code) | 484 | if (!code) |
485 | goto cfgerr; | 485 | goto cfgerr; |
486 | /* "mark" is not a real facility, skip it */ | 486 | /* "mark" is not a real facility, skip it */ |
@@ -797,9 +797,9 @@ static void parse_fac_prio_20(int pri, char *res20) | |||
797 | { | 797 | { |
798 | const CODE *c_pri, *c_fac; | 798 | const CODE *c_pri, *c_fac; |
799 | 799 | ||
800 | c_fac = find_by_val(LOG_FAC(pri) << 3, facilitynames); | 800 | c_fac = find_by_val(LOG_FAC(pri) << 3, bb_facilitynames); |
801 | if (c_fac) { | 801 | if (c_fac) { |
802 | c_pri = find_by_val(LOG_PRI(pri), prioritynames); | 802 | c_pri = find_by_val(LOG_PRI(pri), bb_prioritynames); |
803 | if (c_pri) { | 803 | if (c_pri) { |
804 | snprintf(res20, 20, "%s.%s", c_fac->c_name, c_pri->c_name); | 804 | snprintf(res20, 20, "%s.%s", c_fac->c_name, c_pri->c_name); |
805 | return; | 805 | return; |
@@ -1109,8 +1109,7 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv) | |||
1109 | INIT_G(); | 1109 | INIT_G(); |
1110 | 1110 | ||
1111 | /* No non-option params */ | 1111 | /* No non-option params */ |
1112 | opt_complementary = "=0"; | 1112 | opts = getopt32(argv, "^"OPTION_STR"\0""=0", OPTION_PARAM); |
1113 | opts = getopt32(argv, OPTION_STR, OPTION_PARAM); | ||
1114 | #if ENABLE_FEATURE_REMOTE_LOG | 1113 | #if ENABLE_FEATURE_REMOTE_LOG |
1115 | while (remoteAddrList) { | 1114 | while (remoteAddrList) { |
1116 | remoteHost_t *rh = xzalloc(sizeof(*rh)); | 1115 | remoteHost_t *rh = xzalloc(sizeof(*rh)); |