summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUGS2
-rw-r--r--MANIFEST56
-rw-r--r--Makefile16
-rw-r--r--NEWS5
-rw-r--r--README.linux6
-rw-r--r--syslogd.c5
-rw-r--r--test.conf4
-rw-r--r--version.h2
8 files changed, 51 insertions, 45 deletions
diff --git a/BUGS b/BUGS
index 38afb911..1073404d 100644
--- a/BUGS
+++ b/BUGS
@@ -45,5 +45,5 @@ official home page at
http://www.monitorware.com/rsyslog
-List as of 2004-12-08
+List as of 2005-03-08
Rainer Gerhards
diff --git a/MANIFEST b/MANIFEST
index be0cb61e..e779b9ec 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -10,23 +10,8 @@ Makefile: A makefile to generate the binaries.
README.linux: Documentation which may prove useful.
-klogd.c: Source code for the kernel log daemon.
-
-klogd.h: Global definitions required for the kernel log daemon.
-
-ksym.c: Source module for the kernel log daemon which implements
- kernel numeric address to symbol translations.
-
-ksym_mod.c: Source module which contains functions which allow ksym.c
- to resolve symbols found in loadable kernel modules.
-
syslogd.c: Source code for the system log daemon.
-syslog.c: A slightly modified version of the syslog.c file found in
- the standard libraries. This special version is needed
- so that klogd will pass messages with kernel priority to
- the syslogd facility.
-
pidfile.c: Source implementing utility functions which are useful
for managing pid files. Used by both syslogd and klogd.
@@ -36,27 +21,28 @@ pidfile.h: Include file containing global definitions for the
version.h: An include file for setting the version and patchlevel
for the package.
-syslog.conf: A sample configuration file. Note that this file uses
+sample.conf: A sample configuration file. Note that this file uses
extensions to the BSD syntax. See the syslog.conf(5)
manpage for more details.
-syslog_tst.c: A simple program to test the system log utility.
-
-sysklogd.8: Man page documenting the general characteristics of this
- package.
-
-klogd.8: Man page documenting the kernel log daemon.
-
-kernel.patch: A source code patch which modifies the linux kernel to
- delimit addresses for symbolic translation by klogd.
-
-oops.c: C source for a loadable kernel module which can be used
- to generate a kernel protection fault. This is used to
- test the address resolution capabilities of klogd.
-
-oops_test.c: A small driver program used in conjunction with the oops
- module to generate a kernel protection fault.
+####new####
+syslog.c: A slightly modified version of the syslog.c file found in
+ the standard libraries. This special version is needed
+ so that klogd will pass messages with kernel priority to
+ the syslogd facility.
-modules.patch: A patch to the modules-2.0.0 package which provides for
- automatic signalling of klogd whenever the kernel module
- state changes.
+rsyslog-0.8.1/srUtils.c
+rsyslog-0.8.1/stringbuf.c
+rsyslog-0.8.1/syslog.c
+rsyslog-0.8.1/syslog_tst.c
+rsyslog-0.8.1/template.c
+rsyslog-0.8.1/liblogging-stub.h
+rsyslog-0.8.1/srUtils.h
+rsyslog-0.8.1/stringbuf.h
+rsyslog-0.8.1/syslogd.h
+rsyslog-0.8.1/template.h
+rsyslog-0.8.1/BUGS
+rsyslog-0.8.1/COPYING
+rsyslog-0.8.1/AUTHORS
+rsyslog-0.8.1/sample.conf
+rsyslog-0.8.1/createDB.sql
diff --git a/Makefile b/Makefile
index 44134dad..e6e42f3b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,19 @@
CC= gcc
#CFLAGS= -g -DSYSV -Wall
-LDFLAGS= -g -Wall -fno-omit-frame-pointer
-CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer
-#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
+# Add the -DMTRACE macro if you would like to use mtrace()
+# to hunt for memory leaks
+# next 2 lines are debug settings
+#LDFLAGS= -g -Wall -fno-omit-frame-pointer
+#CFLAGS= -DSYSV -g -Wall -fno-omit-frame-pointer
+
+# the next two lines are essentially the same, but -DWITH_DB
+# enables the MySQL code. By default, that one is commented out
+# change the comment chars to activate it if you need MySQL!
+# In this case, also look down further to uncomment the libs
+CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
#CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -DWITH_DB
-#LDFLAGS= -s
+LDFLAGS= -s
INSTALL = install
BINDIR = /usr/sbin
diff --git a/NEWS b/NEWS
index 8a86d7cf..8aa4d7cd 100644
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,11 @@ Version 0.8.1
- fixed a nasty memory leak (probably not the last one with this release)
- some enhancements to Makefile as suggested by Bennett Todd
+- syslogd-internal messages (like restart) were missing the hostname
+ this has been corrected
---------------------------------------------------------------------------
Version 0.8.0
-Initial testing release.
+Initial testing release. Based on the sysklogd package. Thanks to the
+sysklogd maintainers for all their good work!
---------------------------------------------------------------------------
diff --git a/README.linux b/README.linux
index 16718cd9..d277d341 100644
--- a/README.linux
+++ b/README.linux
@@ -26,6 +26,10 @@ and this might delay things a little. Our immediate goal is to receive
feedback and get the bugs out of the current release. Only after that
we intend to advance the code and introduce new features.
+This file comes with version 0.8.1. Thanks to previous input, a memory
+leak could be detected and also be fixed (as could some minor things).
+So this release hopefully has a few bugs less.
+
The database support was included so that our web-based syslog interface
can be used. This is another open source project which can be found
under http://www.liblogging.org . We highly recommend having a look at
@@ -52,4 +56,4 @@ on sourceforge.net.
Best regards,
Rainer Gerhards
Adiscon
-2004-12-08
+2005-03-08
diff --git a/syslogd.c b/syslogd.c
index 2c79f4af..85969c1f 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -535,7 +535,9 @@ static char sccsid[] = "@(#)rsyslogd.c 0.2 (Adiscon) 11/08/2004";
#define CONT_LINE 1 /* Allow continuation lines */
+#ifdef MTRACE
#include <mcheck.h>
+#endif
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
@@ -2057,8 +2059,10 @@ int main(argc, argv)
*/
fd_set readfds;
+#ifdef MTRACE
mtrace(); /* this is a debug aid for leak detection - either remove
* or put in conditional compilation. 2005-01-18 RGerhards */
+#endif
#ifndef TESTING
int fd;
@@ -2852,6 +2856,7 @@ void logmsgInternal(pri, msg, from, flags)
if(MsgSetUxTradMsg(pMsg, msg) != 0) return;
if(MsgSetRawMsg(pMsg, msg) != 0) return;
+ if(MsgSetHOSTNAME(pMsg, LocalHostName) != 0) return;
pMsg->iFacility = LOG_FAC(pri);
pMsg->iSeverity = LOG_PRI(pri);
pMsg->iMsgSource = SOURCE_INTERNAL;
diff --git a/test.conf b/test.conf
index 5bb935ac..14b8c75d 100644
--- a/test.conf
+++ b/test.conf
@@ -134,9 +134,9 @@ $template WinSyslogFmt,"%HOSTNAME%,%timegenerated:1:10:date-rfc3339%,%timegenera
# by a comma and then the name of a template to use.
# This is an example:
#authpriv.* /var/log/secure,precise
-*.* rger
+#*.* rger
#*.* *;MySQLInsert
-*.* /home/rger/proj/rsyslog/logfile;WinSyslogFmt
+*.* -/home/rger/proj/rsyslog/logfile;WinSyslogFmt
#*.* /home/rger/proj/rsyslog/logfile;UserMsg
#*.* /home/rger/proj/rsyslog/tradfile;TraditionalFormat
#*.* @172.19.2.16;RFC3164fmt
diff --git a/version.h b/version.h
index 9c4400bc..1fe99072 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
#define VERSION "0.8"
-#define PATCHLEVEL "0"
+#define PATCHLEVEL "1"