summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-12-11 19:28:29 +0000
committerEric Andersen2000-12-11 19:28:29 +0000
commit4ed17829ac088b568c166e2cb7d51d553231a247 (patch)
treeef37ca7b3d59e170cbad37b4244a97abaeca1a01
parentb2356f6de94820291f35d63943a622708546b59c (diff)
downloadbusybox-4ed17829ac088b568c166e2cb7d51d553231a247.zip
busybox-4ed17829ac088b568c166e2cb7d51d553231a247.tar.gz
Fix a thinko -- when REMOTE_LOG support is compiled in,
but the user has not specified remote logging, then be sure to log locally... duh.
-rw-r--r--sysklogd/syslogd.c6
-rw-r--r--syslogd.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 2d5e52f..7501380 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -521,6 +521,12 @@ extern int syslogd_main(int argc, char **argv)
}
}
+#ifdef BB_FEATURE_REMOTE_LOG
+ /* If they have not specified remote logging, then log locally */
+ if (doRemoteLog == FALSE)
+ local_logging = TRUE;
+#endif
+
/* Store away localhost's name before the fork */
gethostname(LocalHostName, sizeof(LocalHostName));
if ((p = strchr(LocalHostName, '.'))) {
diff --git a/syslogd.c b/syslogd.c
index 2d5e52f..7501380 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -521,6 +521,12 @@ extern int syslogd_main(int argc, char **argv)
}
}
+#ifdef BB_FEATURE_REMOTE_LOG
+ /* If they have not specified remote logging, then log locally */
+ if (doRemoteLog == FALSE)
+ local_logging = TRUE;
+#endif
+
/* Store away localhost's name before the fork */
gethostname(LocalHostName, sizeof(LocalHostName));
if ((p = strchr(LocalHostName, '.'))) {