summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS7
-rw-r--r--createDB.sql74
-rw-r--r--linux/Makefile4
-rw-r--r--master.make23
-rw-r--r--rsyslog.conf26
-rw-r--r--syslog.c2
6 files changed, 92 insertions, 44 deletions
diff --git a/NEWS b/NEWS
index ed1d9f8a..123dc42a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,12 @@
---------------------------------------------------------------------------
-Version 1.13.2 (RGer), 2007-02-??
+Version 1.13.2 (RGer), 2007-06-11
- lib order in makefile patched to facilitate static linking - thanks
to Bennett Todd for providing the patch
+- Integrated a patch from Peter Vrabec (pvrabec@redheat.com):
+ - added klogd under the name of rklogd (remove dependency on
+ original sysklogd package
+ - createDB.sql now in UTF
+ - added additional config files for use on Red Hat
---------------------------------------------------------------------------
Version 1.13.1 (RGer), 2007-02-05
- changed the listen backlog limit to a more reasonable value based on
diff --git a/createDB.sql b/createDB.sql
index 10eabd69..211cfb0e 100644
--- a/createDB.sql
+++ b/createDB.sql
@@ -1,37 +1,37 @@
-CREATE DATABASE Syslog;
-USE Syslog;
-CREATE TABLE SystemEvents
-(
- ID int unsigned not null auto_increment primary key,
- CustomerID bigint,
- ReceivedAt datetime NULL,
- DeviceReportedTime datetime NULL,
- Facility smallint NULL,
- Priority smallint NULL,
- FromHost varchar(60) NULL,
- Message text,
- NTSeverity int NULL,
- Importance int NULL,
- EventSource varchar(60),
- EventUser varchar(60) NULL,
- EventCategory int NULL,
- EventID int NULL,
- EventBinaryData text NULL,
- MaxAvailable int NULL,
- CurrUsage int NULL,
- MinUsage int NULL,
- MaxUsage int NULL,
- InfoUnitID int NULL ,
- SysLogTag varchar(60),
- EventLogType varchar(60),
- GenericFileName VarChar(60),
- SystemID int NULL
-);
-
-CREATE TABLE SystemEventsProperties
-(
- ID int unsigned not null auto_increment primary key,
- SystemEventID int NULL ,
- ParamName varchar(255) NULL ,
- ParamValue text NULL
-); \ No newline at end of file
+CREATE DATABASE Syslog;
+USE Syslog;
+CREATE TABLE SystemEvents
+(
+ ID int unsigned not null auto_increment primary key,
+ CustomerID bigint,
+ ReceivedAt datetime NULL,
+ DeviceReportedTime datetime NULL,
+ Facility smallint NULL,
+ Priority smallint NULL,
+ FromHost varchar(60) NULL,
+ Message text,
+ NTSeverity int NULL,
+ Importance int NULL,
+ EventSource varchar(60),
+ EventUser varchar(60) NULL,
+ EventCategory int NULL,
+ EventID int NULL,
+ EventBinaryData text NULL,
+ MaxAvailable int NULL,
+ CurrUsage int NULL,
+ MinUsage int NULL,
+ MaxUsage int NULL,
+ InfoUnitID int NULL ,
+ SysLogTag varchar(60),
+ EventLogType varchar(60),
+ GenericFileName VarChar(60),
+ SystemID int NULL
+);
+
+CREATE TABLE SystemEventsProperties
+(
+ ID int unsigned not null auto_increment primary key,
+ SystemEventID int NULL ,
+ ParamName varchar(255) NULL ,
+ ParamValue text NULL
+);
diff --git a/linux/Makefile b/linux/Makefile
index c8321a75..75d68507 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -50,8 +50,8 @@ FEATURE_DEBUG=0
#
# THESE PATHES MUST ONLY BE SET IF RSYSLOG IS BUILD WITH
# RFC 3195 SUPPORT!
-LIBLOGGING_INC=-I../../liblogging/src
-LIBLOGGING_BIN=../../liblogging/src/linux/liblogging.a
+LIBLOGGING_INC=-I../../liblogging-0.6.0/src
+LIBLOGGING_BIN=../../liblogging-0.6.0/src/linux/liblogging.a
#############################################################
# END OF USER SETTINGS #
diff --git a/master.make b/master.make
index 645af14c..0ddc450e 100644
--- a/master.make
+++ b/master.make
@@ -31,11 +31,12 @@ SYSLOGD_PIDNAME = -DSYSLOGD_PIDNAME=\"rsyslogd.pid\"
SYSLOGD_FLAGS= -DSYSLOG_INET -DSYSLOG_UNIXAF ${FSSTND} \
${SYSLOGD_PIDNAME}
SYSLOG_FLAGS= -DALLOW_KERNEL_LOGGING
+KLOGD_FLAGS = ${FSSTND} ${KLOGD_START_DELAY}
.c.o:
${CC} ${CFLAGS} ${NETZIP} ${LIBLOGGING_INC} -c $(VPATH)$*.c
-all: rfc3195d syslogd
+all: klogd rfc3195d syslogd
test: syslog_tst tsyslogd
@@ -57,9 +58,22 @@ rfc3195d.o: rfc3195d.c rsyslog.h
syslogd.o: syslogd.c version.h parse.h template.h stringbuf.h outchannel.h syslogd.h rsyslog.h
${CC} ${CFLAGS} ${NETZIP} ${SYSLOGD_FLAGS} -c $(VPATH)syslogd.c
+klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
+ ${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
+ ksym_mod.o ${LIBS}
+
syslog.o: syslog.c
${CC} ${CFLAGS} ${SYSLOG_FLAGS} -c $(VPATH)syslog.c
+klogd.o: klogd.c klogd.h version.h
+ ${CC} ${CFLAGS} ${KLOGD_FLAGS} $(DEB) -c $(VPATH)klogd.c
+
+ksym.o: ksym.c klogd.h
+ ${CC} ${CFLAGS} ${KLOGD_FLAGS} -c $(VPATH)ksym.c
+
+ksym_mod.o: ksym_mod.c klogd.h
+ ${CC} ${CFLAGS} ${KLOGD_FLAGS} -c $(VPATH)ksym_mod.c
+
clean:
rm -f *.o *.log *~ *.orig syslogd rfc3195d
@@ -67,13 +81,14 @@ clobber: clean
rm -f syslogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
install_exec: syslogd rfc3195d
+ ${INSTALL} -b -s klogd ${DESTDIR}${BINDIR}/rklogd
${INSTALL} -b -s syslogd ${DESTDIR}${BINDIR}/rsyslogd
${INSTALL} -b -s rfc3195d ${DESTDIR}${BINDIR}/rfc3195d
install_man:
- ${INSTALL} $(VPATH)rfc3195d.8 ${DESTDIR}${MANDIR}/man8/rfc3195d.8
- ${INSTALL} $(VPATH)rsyslogd.8 ${DESTDIR}${MANDIR}/man8/rsyslogd.8
- ${INSTALL} $(VPATH)rsyslog.conf.5 ${DESTDIR}${MANDIR}/man5/rsyslog.conf.5
+ ${INSTALL} -m 644 $(VPATH)rfc3195d.8 ${DESTDIR}${MANDIR}/man8/rfc3195d.8
+ ${INSTALL} -m 644 $(VPATH)rsyslogd.8 ${DESTDIR}${MANDIR}/man8/rsyslogd.8
+ ${INSTALL} -m 644 $(VPATH)rsyslog.conf.5 ${DESTDIR}${MANDIR}/man5/rsyslog.conf.5
# The following lines are some legacy from sysklogd, which we might need
# again in the future. So it is just commented out for now, eventually
diff --git a/rsyslog.conf b/rsyslog.conf
new file mode 100644
index 00000000..9d34c805
--- /dev/null
+++ b/rsyslog.conf
@@ -0,0 +1,26 @@
+# Log all kernel messages to the console.
+# Logging much else clutters up the screen.
+#kern.* /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none /var/log/messages
+
+# The authpriv file has restricted access.
+authpriv.* /var/log/secure
+
+# Log all the mail messages in one place.
+mail.* -/var/log/maillog
+
+
+# Log cron stuff
+cron.* /var/log/cron
+
+# Everybody gets emergency messages
+*.emerg *
+
+# Save news errors of level crit and higher in a special file.
+uucp,news.crit /var/log/spooler
+
+# Save boot messages also to boot.log
+local7.* /var/log/boot.log
diff --git a/syslog.c b/syslog.c
index 94208a45..59822220 100644
--- a/syslog.c
+++ b/syslog.c
@@ -50,6 +50,8 @@
#include <sys/file.h>
#include <sys/signal.h>
#include <sys/syslog.h>
+#undef syslog
+#undef vsyslog
#if 0
#include "syslog.h"
#include "pathnames.h"
generated by cgit (git 2.34.1) at 2024-11-12 04:49:46 +0000