Patch from Gennady Feldman <gfeldman@mail.com> to make syslogd not log

when compiled for remote logging.  Not the ideal way to fix it (it should
really be a runtime switch), but good enough for now I guess...

diff --git a/Changelog b/Changelog
index 3095c95cb5b1846c84eb239221c2f8b695116e2e..5c5be4252980790a9732c885c721f026f36885e3 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -46,6 +46,8 @@
        * Jim Gleason <jimg@lineo.com> -- fixed tar so it no longer breaks 
            hard links.
        * Matt Kraai -- logger now logs all arguments, not just the first
+       * Gennady Feldman -- syslogd no longer logs to localhost if compiled
+           for remote logging...
 
 
         -Erik Andersen

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index d82aa63fd29c060b0a1a147756f2faaf5ce32d7b..bb0df8c5195a792eb09783fce87db6b0311e72e6 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -161,9 +161,6 @@ static void logMessage (int pri, char *msg)
 
        /* todo: supress duplicates */
 
-       /* now spew out the message to wherever it is supposed to go */
-       message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
-
 #ifdef BB_FEATURE_REMOTE_LOG
        /* send message to remote logger */
         if ( -1 != remotefd){
@@ -184,8 +181,11 @@ static void logMessage (int pri, char *msg)
             error_msg_and_die("syslogd: cannot write to remote file handle on" 
                        "%s:%d\n",RemoteHost,RemotePort);
           }
-        }
+        } else
 #endif
+       /* now spew out the message to wherever it is supposed to go */
+       message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
+
 
 }
 

diff --git a/syslogd.c b/syslogd.c
index d82aa63fd29c060b0a1a147756f2faaf5ce32d7b..bb0df8c5195a792eb09783fce87db6b0311e72e6 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -161,9 +161,6 @@ static void logMessage (int pri, char *msg)
 
        /* todo: supress duplicates */
 
-       /* now spew out the message to wherever it is supposed to go */
-       message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
-
 #ifdef BB_FEATURE_REMOTE_LOG
        /* send message to remote logger */
         if ( -1 != remotefd){
@@ -184,8 +181,11 @@ static void logMessage (int pri, char *msg)
             error_msg_and_die("syslogd: cannot write to remote file handle on" 
                        "%s:%d\n",RemoteHost,RemotePort);
           }
-        }
+        } else
 #endif
+       /* now spew out the message to wherever it is supposed to go */
+       message("%s %s %s %s\n", timestamp, LocalHostName, res, msg);
+
 
 }