diff options
| author | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2025-05-19 08:34:32 +0100 |
| commit | 64bf69893bd99c305d13a956389f216e7d15c682 (patch) | |
| tree | 7fa7d449f0633c86c1248c0bb86363dd9f46da38 /sysklogd/syslogd.c | |
| parent | a807cdfa95cf4af2f84e207ed15887cc3514cb43 (diff) | |
| parent | 5f07327251c93184dfcfc8d978fc35705930ec53 (diff) | |
| download | busybox-w32-merge.tar.gz busybox-w32-merge.tar.bz2 busybox-w32-merge.zip | |
Merge branch 'busybox' into mergemerge
Diffstat (limited to '')
| -rw-r--r-- | sysklogd/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 7558051f0..2cbb22b6d 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
| @@ -1045,7 +1045,7 @@ static int NOINLINE syslogd_init(char **argv) | |||
| 1045 | #endif | 1045 | #endif |
| 1046 | /* If they have not specified remote logging, then log locally */ | 1046 | /* If they have not specified remote logging, then log locally */ |
| 1047 | if (ENABLE_FEATURE_REMOTE_LOG && !(opts & OPT_remotelog)) // -R | 1047 | if (ENABLE_FEATURE_REMOTE_LOG && !(opts & OPT_remotelog)) // -R |
| 1048 | option_mask32 |= OPT_locallog; | 1048 | option_mask32 = (opts |= OPT_locallog); |
| 1049 | #if ENABLE_FEATURE_SYSLOGD_CFG | 1049 | #if ENABLE_FEATURE_SYSLOGD_CFG |
| 1050 | parse_syslogdcfg(opt_f); | 1050 | parse_syslogdcfg(opt_f); |
| 1051 | #endif | 1051 | #endif |