applied some doc fixes from Michel Biebl and cleaned up some no longer

    needed files suggested by him

9 files changed, 4 insertions, 392 deletions

diff --git a/BUGS b/BUGS
deleted file mode 100644
index 7f537a29..00000000
--- a/BUGS
+++ /dev/null
@@ -1 +0,0 @@
-This file has been superseeded by doc/bugs.html. Check there.
diff --git a/CHANGES b/CHANGES
deleted file mode 100644
index 07249375..00000000
--- a/CHANGES
+++ /dev/null
@@ -1 +0,0 @@
-This file has been superseeded by NEWS. Please see there.
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index 6cfb0d3a..00000000
--- a/MANIFEST
+++ /dev/null
@@ -1,57 +0,0 @@
-This file basically stems back to the sysklog package. It is currently not
-being maintained and is considered to be replaced by some other method
-in the future. We have not yet removed it, because it still contains some
-helpful information. When using it, keep in mind that it is not up to date.
-However, what is written here still applies, but often is not the
-sole truth ;)
-
-Rainer Gerhards, 2005-08-10
-
-A virgin copy of these sources should include 12 files:
-
-MANIFEST:	This file.
-
-INSTALL:	Brief installation instructions.
-
-NEWS:		Important changes.
-
-Makefile:	A makefile to generate the binaries.
-
-README.linux:	Documentation which may prove useful.
-
-syslogd.c:	Source code for the system log daemon.
-
-pidfile.c:	Source implementing utility functions which are useful
-		for managing pid files.  Used by both syslogd and klogd.
-
-pidfile.h:	Include file containing global definitions for the
-		pid file utility functions.
-
-version.h:	An include file for setting the version and patchlevel
-		for the package.
-
-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.
-
-####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.
-
-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/doc/Makefile.am b/doc/Makefile.am
index fce42eb9..1449a13f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,6 +11,7 @@ html_files = \
 	modules.html \
 	property_replacer.html \
 	rsyslog_conf.html \
+	rsyslog-example.conf \
 	rsyslog_mysql.html \
 	rsyslog_packages.html \
 	rsyslog_php_syslog_ng.html \
@@ -38,6 +39,9 @@ html_files = \
 	rsconf1_filecreatemode.html \
 	rsconf1_filegroup.html \
 	rsconf1_fileowner.html \
+	rsconf1_gssforwardservicename.html \
+	rsconf1_gsslistenservicename.html \
+	rsconf1_gssmode.html \
 	rsconf1_includeconfig.html \
 	rsconf1_mainmsgqueuesize.html \
 	rsconf1_modload.html \
diff --git a/doc/manual.html b/doc/manual.html
index 4c3c15a0..aeddb04f 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -72,12 +72,6 @@ of Fame&quot;</a> --><li><a href="modules.html">description of rsyslog modules</
 
 </ul>
 
-<p>Also, there is an article from Dennis Olvany on 
-
-<a href="rsyslog084-freebsd5.4.txt">Syslog-to-SQL with rsyslog-0.8.4 on FreeBSD 5.4</a> 
-
-(which unfortunately is a bit outdated now).</p>
-
 <p>Our <a href="history.html">rsyslog history</a> page is for you if you would like to learn a little more
 
 on why there is an rsyslog at all. If you are interested why you should care 
diff --git a/modutils.patch b/modutils.patch
deleted file mode 100644
index 4dff7f35..00000000
--- a/modutils.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -u --new-file --recursive base/modules-2.0.0/depmod/modprobe.c ./modules-2.0.0/depmod/modprobe.c
---- base/modules-2.0.0/depmod/modprobe.c	Mon Jun 10 05:29:08 1996
-+++ ./modules-2.0.0/depmod/modprobe.c	Thu Aug 29 09:58:01 1996
-@@ -233,6 +233,13 @@
- 	verbose ("\r\t%s\n\t\t",cmd);
- 	int ret = system(cmd);
- #endif
-+	if ( fork() == 0 )
-+	{
-+		/* Child process. */
-+		if ( execlp("klogd", "klogd", "-i", (char *) 0)  < 0 )
-+			fprintf(stderr, "Failure in signaling klogd.\n");
-+		exit(0);
-+	}
- 	return ret;
- }
- /*
-diff -u --new-file --recursive base/modules-2.0.0/insmod/insmod.c ./modules-2.0.0/insmod/insmod.c
---- base/modules-2.0.0/insmod/insmod.c	Mon Jun 10 06:42:25 1996
-+++ ./modules-2.0.0/insmod/insmod.c	Thu Aug 29 09:56:53 1996
-@@ -253,6 +253,18 @@
- 	++n_stringpatches;
- }
- 
-+
-+void signal_klogd() {
-+	if ( fork() == 0 )
-+	{
-+		if ( execlp("klogd", "klogd", "-i", (char *) 0)  < 0 )
-+			fprintf(stderr, "Failure in signaling klogd.\n");
-+		exit(0);
-+	}
-+	return;
-+}
-+
-+
- int main(int argc, char **argv)
- {
- 	FILE *fp;
-@@ -983,6 +995,8 @@
- 			symvalue(sp) + addr, symtype, symname(sp));
- 	}
- 
-+	signal_klogd();
-+
- 	if (nksyms > 0)
- 		free(ksymtab); /* it has done its job */
- 
-@@ -1292,6 +1306,7 @@
- 			--argc;
- 			++argv;
- 		}
-+		signal_klogd();
- 		return errors;
- 	}
- 	/* else recursive removal */
-@@ -1353,6 +1368,8 @@
- 			break;
- 		}
- 	}
-+
-+	signal_klogd();
- 
- 	return errors;
- }
diff --git a/syslog.conf b/syslog.conf
deleted file mode 100644
index 801f35fb..00000000
--- a/syslog.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# /etc/syslog.conf - Configuration file for syslogd(8)
-#
-# For info about the format of this file, see "man syslog.conf".
-#
-*.=debug			-/usr/adm/debug
-*.warning			/usr/adm/syslog
-
-# Store critical stuff in critical
-#
-*.=crit;kern.none               /var/adm/critical
-
-# Kernel messages are first, stored in the kernel file, 
-# critical messages and higher ones also go to another
-# host and to the console
-#
-kern.*				/var/adm/kernel
-kern.crit			@finlandia
-kern.crit			/dev/console
-kern.info;kern.!err		/var/adm/kernel-info
-
-# The tcp wrapper loggs with mail.info, we display all
-# the connections on tty12
-#
-mail.=info			/dev/tty12
-
-# Store all mail concearning stuff in a file
-#
-mail.*;mail.!=info		-/var/adm/mail
-
-# Log all mail.info and news.info messages to info
-#
-mail,news.=info			-/var/adm/info
-
-# Log info and notice mesages to messages file
-#
-*.=info;*.=notice;mail.none	-/usr/adm/messages
-#*.=info;mail,news.none		-/usr/adm/messages
-
-# Emergency messages will be displayed using wall
-#
-*.=emerg                        *
-
-# Messages of the priority alert will be directed
-# to the operator
-#
-*.alert                         root,joey
diff --git a/syslog_tst.c b/syslog_tst.c
deleted file mode 100644
index 40896b31..00000000
--- a/syslog_tst.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Program to test daemon logging. */
-
-/*
- * Sat Dec 11 12:07:50 CST 1993:  Dr. Wettstein
- *	Compiles clean with -Wall.  Renamed for first public distribution.
- *	Use this freely but if you make a ton of money with it I
- *	expect a cut...  :-)
- *
- * Thu Jan  6 11:52:10 CST 1994:  Dr. Wettstein
- *	Added support for reading getting log input from the standard
- *	input.  To activate this use a - as the single arguement to the
- *	the program.  Note that there is a hack in the code to pause
- *	after each 1K has been written.  This eliminates what appears
- *	to be a problem with overrunning a UNIX domain socket with
- *	excessive amounts of input.
- */
-#include "config.h"
-
-
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/param.h>
-
-extern int main(int, char **);
-
-
-int main(int argc, char *argv[])
-{
-	auto char *nl,
-	          bufr[512];
-	auto int logged = 0;
-	
-	openlog("DOTEST", LOG_PID, LOG_DAEMON);
-	if (argc > 1)
-	{
-		if ( (*argv[1] == '-') && (*(argv[1]+1) == '\0') )
-		{
-			while (!feof(stdin))
-				if ( fgets(bufr, sizeof(bufr), stdin) != \
-				    (char *) 0 )
-				{
-					if ( (nl = strrchr(bufr, '\n')) != \
-					    (char *) 0)
-						*nl = '\0';
-					syslog(LOG_INFO, bufr);
-					logged += strlen(bufr);
-					if ( logged > 1024 )
-					{
-						sleep(1);
-						logged = 0;
-					}
-					
-				}
-		}
-		else
-			while (argc-- > 1)
-				syslog(LOG_INFO, argv++[1]);
-	}
-	else
-	{
-		syslog(LOG_EMERG, "EMERG log.");
-		syslog(LOG_ALERT, "Alert log.");
-		syslog(LOG_CRIT, "Critical log.");
-		syslog(LOG_ERR, "Error log.");
-		syslog(LOG_WARNING, "Warning log.");
-		syslog(LOG_NOTICE, "Notice log.");
-		syslog(LOG_INFO, "Info log.");
-		syslog(LOG_DEBUG, "Debug log.");
-		closelog();
-		return(0);
-	}
-
-	return(0);
-}
diff --git a/test.conf b/test.conf
deleted file mode 100644
index 94ab8934..00000000
--- a/test.conf
+++ /dev/null
@@ -1,140 +0,0 @@
-# 2004-11-17 rgerhards: work copy of the new syslog.conf
-# We try to keep things as consistent with existing syslog implementation
-# as possible. We use "$" to start lines that contain new dirctives.
-# Set syslogd options
-
-# Templates are a key feature of rsyslog. They allow to specify any
-# format a user might want. Every output in rsyslog uses templates - this
-# holds true for files, user messages and so on. The database writer
-# expects its template to be a proper SQL statement - so this is highly
-# customizable too. You might ask how does all of this work when no templates
-# at all are specified. Good question ;) The answer is simple, though. Templates
-# compatible with the stock syslogd formats are hardcoded into rsyslog. So if
-# no template is specified, we use one of these hardcoded templates. Search for
-# "template_" in syslogd.c and you will find the hardcoded ones.
-#
-# A template consists of a template directive, a name, the actual template text
-# and optional options. A sample is:
-#
-# $template MyTemplateName,"\7Text %property% some more text\n",<options>
-#
-# The "$template" is the template directive. It tells rsyslog that this
-# line contains a template.
-#
-# "MyTemplateName" is the template name. All other config lines refer to
-# this name.
-#
-# The text within quotes is the actual template text. The backslash is 
-# a escape character, much as in C. It does all these "cool" things. For
-# example, \7 rings the bell (this is an ASCII value), \n is a new line.
-# C programmers and perl coders have the advantage of knowing this, but the
-# set in rsyslog is a bit restricted currently. All text in the template
-# is used literally, except for things within percent signs. These are 
-# properties and allow you access to the contents of the syslog message.
-# Properties are accessed via the property replacer (nice name, huh) and
-# it can do cool things, too. For example, it can pick a substring or
-# do date-specific formatting. More on this is below, on some lines of the
-# property replacer.
-#
-# The <options> part is optional. It carries options that influence the
-# template as whole. Details are below. Be sure NOT to mistake template
-# options with property options - the later ones are processed by the
-# property replacer and apply to a SINGLE property, only (and not the
-# whole template).
-#
-# Template options are case-insensitive. Currently defined are:
-# sql - format the string suitable for a SQL statement. This will replace single
-#       quotes ("'") by two single quotes ("''") inside each field. This option MUST
-#       be specified when a template is used for writing to a database, otherwise SQL
-#       injection might occur.
-#
-# 	Please note that the database writer *checks* that the sql option is
-#	present in the template. If it is not present, the write database action
-#	is disabled. This is to guard you against accidential forgetting it and
-#	then becoming vulnerable for SQL injection.
-#	The sql option can also be useful with files - especially if you want
-#	to run them on another machine for performance reasons. However, do NOT
-#	use it if you do not have a real need for it - among others, it takes
-#	some toll on the processing time. Not much, but on a really busy system
-#	you might notice it ;)
-#
-# To escape:
-# % = \%
-# \ = \\
-# --> '\' is used to escape (as in C)
-#$template TraditionalFormat,%timegenerated% %HOSTNAME% %syslogtag%%msg%\n"
-#
-# Properties can be accessed by the property replacer. They are accessed
-# inside the template by putting them between percent signs. Properties
-# can be modifed by the property replacer. The full syntax is as follows:
-#
-# %propname:fromChar:toChar:options%
-#
-# propname is the name of the property to access. This IS case-sensitive!
-# Currently supported are:
-# msg		the MSG part of the message (aka "the message" ;))
-# rawmsg	the message excactly as it was received from the
-#		socket. Should be useful for debugging.
-# UxTradMsg	will disappear soon - do NOT use!
-# HOSTNAME	hostname from the message
-# source	alias for HOSTNAME
-# syslogtag	TAG from the message
-# PRI		PRI part of the message - undecoded (single value)
-# IUT		the monitorware InfoUnitType - used when talking to a
-#		MonitorWare backend (also for phpLogCon)
-# syslogfacility	the facility from the message - in numerical form
-# syslogpriority	the priority (actully severity!) from the
-#			message - in numerical form
-# timegenerated	timestamp when the message was RECEIVED. Always in high
-#		resolution
-# timereported	timestamp from the message. Resolution depends on what
-#		was provided in the message (in most cases, only seconds)
-# TIMESTAMP	alias for timereported
-#
-# FromChar and toChar are used to build substrings. They specify the
-# offset within the string that should be copied. Offset counting
-# starts at 1, so if you need to obtain the first 2 characters of the
-# message text, you can use this syntax: "%msg:1:2%".
-# If you do not whish to specify from and to, but you want to
-# specify options, you still need to include the colons. For example,
-# if you would like to convert the full message text to lower case
-# only, use "%msg:::lowercase%".
-#
-# property options are case-insensitive, currently defined are:
-# uppercase	convert property to lowercase only
-# lowercase	convert property text to uppercase only
-# drop-last-lf	The last LF in the message (if any), is dropped. 
-#		Especially useful for PIX.
-# date-mysql	format as mysql date
-# date-rfc3164	format as RFC 3164 date
-# date-rfc3339	format as RFC 3339 date
-# escape-cc	NOT yet implemented
-
-# Below find some samples of what a template can do. Have a good
-# time finding out what they do ;)
-
-# A template that resambles traditional syslogd file output:
-$template TraditionalFormat,"%timegenerated% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"
-
-# A template that tells you a little more about the message:
- $template precise,"%syslogpriority%,%syslogfacility%,%timegenerated%,%HOSTNAME%,%syslogtag%,%msg%\n"
-$template RFC3164fmt,"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag%%msg%"
-#$template precise,"%syslogpriority%,%syslogfacility%,%timegenerated::fulltime%,%HOSTNAME%,%syslogtag%,%msg%\n",1024
-$template usermsg," XXXX%syslogtag%%msg%\n\r"
-#$template wallmsg,"\r\n\7Message from syslogd@%HOSTNAME% at %timegenerated% ...\r\n %syslogtag%%msg%\n\r"
-$template MySQLInsert,"insert iut, message, receivedat values ('%iut%', '%msg:::UPPERCASE%', '%timegenerated:::date-mysql%') into systemevents\r\n", SQL
-
-# the template below emulates winsyslog format, but we need to check the time
-# stamps used. for now, it is good enough ;)
-$template WinSyslogFmt,"%HOSTNAME%,%timegenerated:1:10:date-rfc3339%,%timegenerated:12:19:date-rfc3339%,%timegenerated:1:10:date-rfc3339%,%timegenerated:12:19:date-rfc3339%,%syslogfacility%,%syslogpriority%,%syslogtag%%msg%\n"
-#$template wallmsg,"\r\n\7Message from syslogd@%HOSTNAME% at %timegenerated:::date-rfc3339% ...\r\n %syslogtag%%msg%\n\r"
-
-# now follow output channel definitions
-#$outchannel name,file-name-template,max-size,action-on-max-size
-#$outchannel rg, /home/rger/proj/rsyslog/size-file  , 1000
-
-# Selector lines are now modified
-# The "action" (e.g. file logging) can be followed
-# by a comma and then the name of a template to use.
-# This is an example:
-*.*		rger