diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-12-11 16:24:16 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-12-11 16:24:16 +0000 |
commit | 70d09ed1cf54ae20d38c5c56c5afb5994cc46f32 (patch) | |
tree | 03967343beeea7544249bd5195c669498e051006 | |
parent | 9962cd9f7879e8b51ab6eca5abd7c5e51cec8685 (diff) | |
download | busybox-w32-70d09ed1cf54ae20d38c5c56c5afb5994cc46f32.tar.gz busybox-w32-70d09ed1cf54ae20d38c5c56c5afb5994cc46f32.tar.bz2 busybox-w32-70d09ed1cf54ae20d38c5c56c5afb5994cc46f32.zip |
Reverse logic so when network logging, it by default does not log locally.
-rw-r--r-- | applets/usage.c | 2 | ||||
-rw-r--r-- | docs/busybox.pod | 6 | ||||
-rw-r--r-- | docs/busybox.sgml | 4 | ||||
-rw-r--r-- | sysklogd/syslogd.c | 6 | ||||
-rw-r--r-- | syslogd.c | 6 | ||||
-rw-r--r-- | usage.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/applets/usage.c b/applets/usage.c index ae6cec8df..74dc44060 100644 --- a/applets/usage.c +++ b/applets/usage.c | |||
@@ -1176,7 +1176,7 @@ const char syslogd_usage[] = | |||
1176 | "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" | 1176 | "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" |
1177 | #ifdef BB_FEATURE_REMOTE_LOG | 1177 | #ifdef BB_FEATURE_REMOTE_LOG |
1178 | "\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n" | 1178 | "\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n" |
1179 | "\t-N\t\tDo not log anything locally -- network logging only.\n" | 1179 | "\t-L\t\tLog locally as well as network logging (defaut is network only)\n" |
1180 | #endif | 1180 | #endif |
1181 | #endif | 1181 | #endif |
1182 | ; | 1182 | ; |
diff --git a/docs/busybox.pod b/docs/busybox.pod index 5e4798439..52ba63943 100644 --- a/docs/busybox.pod +++ b/docs/busybox.pod | |||
@@ -1730,8 +1730,8 @@ Options: | |||
1730 | -n Run as a foreground process | 1730 | -n Run as a foreground process |
1731 | -K Do not start up the klogd process | 1731 | -K Do not start up the klogd process |
1732 | -O FILE Use an alternate log file (default=/var/log/messages) | 1732 | -O FILE Use an alternate log file (default=/var/log/messages) |
1733 | -R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP. | 1733 | -R HOST[:PORT] Log remotely to IP or hostname on PORT (default PORT=514/UDP) |
1734 | -N Do not log anything locally -- network logging only | 1734 | -L Log locally as well as network logging (defaut is network only) |
1735 | 1735 | ||
1736 | Example: | 1736 | Example: |
1737 | 1737 | ||
@@ -2292,4 +2292,4 @@ Enrique Zanardi <ezanardi@ull.es> | |||
2292 | 2292 | ||
2293 | =cut | 2293 | =cut |
2294 | 2294 | ||
2295 | # $Id: busybox.pod,v 1.80 2000/12/09 16:37:53 andersen Exp $ | 2295 | # $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 7d86e19e2..a4d173698 100644 --- a/docs/busybox.sgml +++ b/docs/busybox.sgml | |||
@@ -3022,8 +3022,8 @@ | |||
3022 | -n Run as a foreground process | 3022 | -n Run as a foreground process |
3023 | -K Do not start up the klogd process | 3023 | -K Do not start up the klogd process |
3024 | -O FILE Use an alternate log file (default=/var/log/messages) | 3024 | -O FILE Use an alternate log file (default=/var/log/messages) |
3025 | -R HOST[:PORT] Log messages to HOST on PORT (default=514) over UDP. | 3025 | -R HOST[:PORT] Log remotely to IP or hostname on PORT (default PORT=514/UDP) |
3026 | -N Do not log anything locally -- network logging only | 3026 | -L Log locally as well as network logging (defaut is network only) |
3027 | </screen> | 3027 | </screen> |
3028 | </para> | 3028 | </para> |
3029 | 3029 | ||
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 75d73e322..fd56aad97 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
@@ -86,7 +86,7 @@ static char *RemoteHost; | |||
86 | static int RemotePort = 514; | 86 | static int RemotePort = 514; |
87 | /* To remote log or not to remote log, that is the question. */ | 87 | /* To remote log or not to remote log, that is the question. */ |
88 | static int doRemoteLog = FALSE; | 88 | static int doRemoteLog = FALSE; |
89 | static int local_logging = TRUE; | 89 | static int local_logging = FALSE; |
90 | #endif | 90 | #endif |
91 | 91 | ||
92 | /* Note: There is also a function called "message()" in init.c */ | 92 | /* Note: There is also a function called "message()" in init.c */ |
@@ -531,8 +531,8 @@ extern int syslogd_main(int argc, char **argv) | |||
531 | doRemoteLog = TRUE; | 531 | doRemoteLog = TRUE; |
532 | stopDoingThat = TRUE; | 532 | stopDoingThat = TRUE; |
533 | break; | 533 | break; |
534 | case 'N': | 534 | case 'L': |
535 | local_logging = FALSE; | 535 | local_logging = TRUE; |
536 | break; | 536 | break; |
537 | #endif | 537 | #endif |
538 | default: | 538 | default: |
@@ -86,7 +86,7 @@ static char *RemoteHost; | |||
86 | static int RemotePort = 514; | 86 | static int RemotePort = 514; |
87 | /* To remote log or not to remote log, that is the question. */ | 87 | /* To remote log or not to remote log, that is the question. */ |
88 | static int doRemoteLog = FALSE; | 88 | static int doRemoteLog = FALSE; |
89 | static int local_logging = TRUE; | 89 | static int local_logging = FALSE; |
90 | #endif | 90 | #endif |
91 | 91 | ||
92 | /* Note: There is also a function called "message()" in init.c */ | 92 | /* Note: There is also a function called "message()" in init.c */ |
@@ -531,8 +531,8 @@ extern int syslogd_main(int argc, char **argv) | |||
531 | doRemoteLog = TRUE; | 531 | doRemoteLog = TRUE; |
532 | stopDoingThat = TRUE; | 532 | stopDoingThat = TRUE; |
533 | break; | 533 | break; |
534 | case 'N': | 534 | case 'L': |
535 | local_logging = FALSE; | 535 | local_logging = TRUE; |
536 | break; | 536 | break; |
537 | #endif | 537 | #endif |
538 | default: | 538 | default: |
@@ -1176,7 +1176,7 @@ const char syslogd_usage[] = | |||
1176 | "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" | 1176 | "\t-O FILE\t\tUse an alternate log file (default=/var/log/messages)\n" |
1177 | #ifdef BB_FEATURE_REMOTE_LOG | 1177 | #ifdef BB_FEATURE_REMOTE_LOG |
1178 | "\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n" | 1178 | "\t-R HOST[:PORT]\t\tLog remotely to IP or hostname on PORT (default PORT=514/UDP)\n" |
1179 | "\t-N\t\tDo not log anything locally -- network logging only.\n" | 1179 | "\t-L\t\tLog locally as well as network logging (defaut is network only)\n" |
1180 | #endif | 1180 | #endif |
1181 | #endif | 1181 | #endif |
1182 | ; | 1182 | ; |