summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2000-12-11 16:24:16 +0000
committerEric Andersen2000-12-11 16:24:16 +0000
commit70d09ed1cf54ae20d38c5c56c5afb5994cc46f32 (patch)
tree03967343beeea7544249bd5195c669498e051006
parent9962cd9f7879e8b51ab6eca5abd7c5e51cec8685 (diff)
downloadbusybox-70d09ed1cf54ae20d38c5c56c5afb5994cc46f32.zip
busybox-70d09ed1cf54ae20d38c5c56c5afb5994cc46f32.tar.gz
Reverse logic so when network logging, it by default does not log locally.
-rw-r--r--applets/usage.c2
-rw-r--r--docs/busybox.pod6
-rw-r--r--docs/busybox.sgml4
-rw-r--r--sysklogd/syslogd.c6
-rw-r--r--syslogd.c6
-rw-r--r--usage.c2
6 files changed, 13 insertions, 13 deletions
diff --git a/applets/usage.c b/applets/usage.c
index ae6cec8..74dc440 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -1176,7 +1176,7 @@ const char syslogd_usage[] =
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
- "\t-N\t\tDo not log anything locally -- network logging only.\n"
+ "\t-L\t\tLog locally as well as network logging (defaut is network only)\n"
#endif
#endif
;
diff --git a/docs/busybox.pod b/docs/busybox.pod
index 5e47984..52ba639 100644
--- a/docs/busybox.pod
+++ b/docs/busybox.pod
@@ -1730,8 +1730,8 @@ Options:
-n Run as a foreground process
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
- -R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
- -N Do not log anything locally -- network logging only
+ -R HOST[:PORT] Log remotely to IP or hostname on PORT (default PORT=514/UDP)
+ -L Log locally as well as network logging (defaut is network only)
Example:
@@ -2292,4 +2292,4 @@ Enrique Zanardi <ezanardi@ull.es>
=cut
-# $Id: busybox.pod,v 1.80 2000/12/09 16:37:53 andersen Exp $
+# $Id: busybox.pod,v 1.81 2000/12/11 16:24:16 andersen Exp $
diff --git a/docs/busybox.sgml b/docs/busybox.sgml
index 7d86e19..a4d1736 100644
--- a/docs/busybox.sgml
+++ b/docs/busybox.sgml
@@ -3022,8 +3022,8 @@
-n Run as a foreground process
-K Do not start up the klogd process
-O FILE Use an alternate log file (default=/var/log/messages)
- -R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP.
- -N Do not log anything locally -- network logging only
+ -R HOST[:PORT] Log remotely to IP or hostname on PORT (default PORT=514/UDP)
+ -L Log locally as well as network logging (defaut is network only)
</screen>
</para>
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 75d73e3..fd56aad 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -86,7 +86,7 @@ static char *RemoteHost;
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
-static int local_logging = TRUE;
+static int local_logging = FALSE;
#endif
/* Note: There is also a function called "message()" in init.c */
@@ -531,8 +531,8 @@ extern int syslogd_main(int argc, char **argv)
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
- case 'N':
- local_logging = FALSE;
+ case 'L':
+ local_logging = TRUE;
break;
#endif
default:
diff --git a/syslogd.c b/syslogd.c
index 75d73e3..fd56aad 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -86,7 +86,7 @@ static char *RemoteHost;
static int RemotePort = 514;
/* To remote log or not to remote log, that is the question. */
static int doRemoteLog = FALSE;
-static int local_logging = TRUE;
+static int local_logging = FALSE;
#endif
/* Note: There is also a function called "message()" in init.c */
@@ -531,8 +531,8 @@ extern int syslogd_main(int argc, char **argv)
doRemoteLog = TRUE;
stopDoingThat = TRUE;
break;
- case 'N':
- local_logging = FALSE;
+ case 'L':
+ local_logging = TRUE;
break;
#endif
default:
diff --git a/usage.c b/usage.c
index ae6cec8..74dc440 100644
--- a/usage.c
+++ b/usage.c
@@ -1176,7 +1176,7 @@ const char syslogd_usage[] =
"\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n"
#ifdef BB_FEATURE_REMOTE_LOG
"\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n"
- "\t-N\t\tDo not log anything locally -- network logging only.\n"
+ "\t-L\t\tLog locally as well as network logging (defaut is network only)\n"
#endif
#endif
;