summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-05-10 15:37:44 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2010-05-10 15:37:44 +0200
commit74f8bf146546275e296a3d5af17cc4c6d0397778 (patch)
treeb33f92e63133f0688d8caf1e23199b608a33b6f7
parent2da019bfca75434428dc2bee05d20a54e8436f1c (diff)
downloadrsyslog-74f8bf146546275e296a3d5af17cc4c6d0397778.tar.gz
rsyslog-74f8bf146546275e296a3d5af17cc4c6d0397778.tar.xz
rsyslog-74f8bf146546275e296a3d5af17cc4c6d0397778.zip
some more cleanup and a nasty little bug i doDie()
-rw-r--r--ChangeLog15
-rw-r--r--tools/syslogd.c13
2 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 60486ae2..fe3517e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5088,6 +5088,21 @@ sysklogd maintainers for all their good work!
---------------------------------------------------------------------------
----------------------------------------------------------------------
+The following comments were left in the syslogd source. While they provide
+not too much detail, the help to date when Rainer started work on the
+project (which was 2003, now even surprising for Rainer himself ;)).
+ * \author Rainer Gerhards <rgerhards@adiscon.com>
+ * \date 2003-10-17
+ * Some initial modifications on the sysklogd package to support
+ * liblogging. These have actually not yet been merged to the
+ * source you see currently (but they hopefully will)
+ *
+ * \date 2004-10-28
+ * Restarted the modifications of sysklogd. This time, we
+ * focus on a simpler approach first. The initial goal is to
+ * provide MySQL database support (so that syslogd can log
+ * to the database).
+----------------------------------------------------------------------
The following comments are from the stock syslogd.c source. They provide
some insight into what happened to the source before we forked
rsyslogd. However, much of the code already has been replaced and more
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 2432a28d..d5df8b91 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -20,18 +20,6 @@
*
* For further information, please see http://www.rsyslog.com
*
- * \author Rainer Gerhards <rgerhards@adiscon.com>
- * \date 2003-10-17
- * Some initial modifications on the sysklogd package to support
- * liblogging. These have actually not yet been merged to the
- * source you see currently (but they hopefully will)
- *
- * \date 2004-10-28
- * Restarted the modifications of sysklogd. This time, we
- * focus on a simpler approach first. The initial goal is to
- * provide MySQL database support (so that syslogd can log
- * to the database).
- *
* rsyslog - An Enhanced syslogd Replacement.
* Copyright 2003-2009 Rainer Gerhards and Adiscon GmbH.
*
@@ -981,7 +969,6 @@ static void doDie(int sig)
# define MSG2 "DoDie called 5 times - unconditional exit\n"
static int iRetries = 0; /* debug aid */
dbgprintf(MSG1);
- if(Debug)
if(Debug == DEBUG_FULL)
write(1, MSG1, sizeof(MSG1) - 1);
if(iRetries++ == 4) {