some more cleanup

reduced dependencies, moved non-runtime files to its own directory except
for some whom's status is unclear

1 files changed, 0 insertions, 3446 deletions

diff --git a/syslogd.c b/syslogd.c
deleted file mode 100644
index 68ffe5ce..00000000
--- a/syslogd.c
+++ /dev/null
@@ -1,3446 +0,0 @@
-/**
- * \brief This is the main file of the rsyslogd daemon.
- *
- * Please visit the rsyslog project at
- *
- * http://www.rsyslog.com
- *
- * to learn more about it and discuss any questions you may have.
- *
- * rsyslog had initially been forked from the sysklogd project.
- * I would like to express my thanks to the developers of the sysklogd
- * package - without it, I would have had a much harder start...
- *
- * Please note that while rsyslog started from the sysklogd code base,
- * it nowadays has almost nothing left in common with it. Allmost all
- * parts of the code have been rewritten.
- *
- * This Project was intiated and is maintained by
- * Rainer Gerhards <rgerhards@hq.adiscon.com>. See
- * AUTHORS to learn who helped make it become a reality.
- *
- * If you have questions about rsyslogd in general, please email
- * info@adiscon.com. To learn more about rsyslogd, please visit
- * 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-2008 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of rsyslog.
- *
- * Rsyslog is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Rsyslog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rsyslog.  If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- */
-#include "config.h"
-#include "rsyslog.h"
-
-/* change the following setting to e.g. 32768 if you would like to
- * support large message sizes for IHE (32k is the current maximum
- * needed for IHE). I was initially tempted to increase it to 32k,
- * but there is a large memory footprint with the current
- * implementation in rsyslog. This will change as the processing
- * changes, but I have re-set it to 1k, because the vast majority
- * of messages is below that and the memory savings is huge, at
- * least compared to the overall memory footprint.
- *
- * If you intend to receive Windows Event Log data (e.g. via
- * EventReporter - www.eventreporter.com), you might want to 
- * increase this number to an even higher value, as event
- * log messages can be very lengthy.
- * rgerhards, 2005-07-05
- *
- * during my recent testing, it showed that 4k seems to be
- * the typical maximum for UDP based syslog. This is a IP stack
- * restriction. Not always ... but very often. If you go beyond
- * that value, be sure to test that rsyslogd actually does what
- * you think it should do ;) Also, it is a good idea to check the
- * doc set for anything on IHE - it most probably has information on
- * message sizes.
- * rgerhards, 2005-08-05
- * 
- * I have increased the default message size to 2048 to be in sync
- * with recent IETF syslog standardization efforts.
- * rgerhards, 2006-11-30
- */
-#define DEFUPRI		(LOG_USER|LOG_NOTICE)
-#define TIMERINTVL	30		/* interval for checking flush, mark */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <limits.h>
-#define GNU_SOURCE
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-#include <assert.h>
-#include <libgen.h>
-
-#ifdef	__sun
-#	include <errno.h>
-#else
-#	include <sys/errno.h>
-#endif
-#include <sys/ioctl.h>
-#include <sys/wait.h>
-#include <sys/file.h>
-
-#if HAVE_SYS_TIMESPEC_H
-# include <sys/timespec.h>
-#endif
-
-#if HAVE_SYS_STAT_H
-#	include <sys/stat.h>
-#endif
-
-#include <signal.h>
-
-#if HAVE_PATHS_H
-#include <paths.h>
-#endif
-
-#ifdef USE_NETZIP
-#include <zlib.h>
-#endif
-
-#include <netdb.h>
-
-#include "pidfile.h"
-#include "srUtils.h"
-#include "stringbuf.h"
-#include "syslogd-types.h"
-#include "template.h"
-#include "outchannel.h"
-#include "syslogd.h"
-
-#include "msg.h"
-#include "modules.h"
-#include "action.h"
-#include "iminternal.h"
-#include "cfsysline.h"
-#include "omshell.h"
-#include "omusrmsg.h"
-#include "omfwd.h"
-#include "omfile.h"
-#include "omdiscard.h"
-#include "threads.h"
-#include "queue.h"
-#include "stream.h"
-#include "conf.h"
-#include "vm.h"
-#include "errmsg.h"
-#include "datetime.h"
-#include "sysvar.h"
-
-/* definitions for objects we access */
-DEFobjCurrIf(obj)
-DEFobjCurrIf(datetime)
-DEFobjCurrIf(conf)
-DEFobjCurrIf(expr)
-DEFobjCurrIf(vm)
-DEFobjCurrIf(var)
-DEFobjCurrIf(module)
-DEFobjCurrIf(errmsg)
-DEFobjCurrIf(net) /* TODO: make go away! */
-
-
-/* forward definitions */
-static rsRetVal GlobalClassExit(void);
-
-/* We define our own set of syslog defintions so that we
- * do not need to rely on (possibly different) implementations.
- * 2007-07-19 rgerhards
- */
-/* missing definitions for solaris
- * 2006-02-16 Rger
- */
-#ifdef __sun
-#	define LOG_AUTHPRIV LOG_AUTH
-#endif
-#define INTERNAL_NOPRI  0x10    /* the "no priority" priority */
-#define LOG_FTP         (11<<3) /* ftp daemon */
-
-
-#ifndef UTMP_FILE
-#ifdef UTMP_FILENAME
-#define UTMP_FILE UTMP_FILENAME
-#else
-#ifdef _PATH_UTMP
-#define UTMP_FILE _PATH_UTMP
-#else
-#define UTMP_FILE "/etc/utmp"
-#endif
-#endif
-#endif
-
-#ifndef _PATH_LOGCONF 
-#define _PATH_LOGCONF	"/etc/rsyslog.conf"
-#endif
-
-#ifndef _PATH_MODDIR
-#define _PATH_MODDIR	"/lib/rsyslog/"
-#endif
-
-#if defined(SYSLOGD_PIDNAME)
-#	undef _PATH_LOGPID
-#	if defined(FSSTND)
-#		ifdef OS_BSD
-#			define _PATH_VARRUN "/var/run/"
-#		endif
-#		if defined(__sun) || defined(__hpux)
-#			define _PATH_VARRUN "/var/run/"
-#		endif
-#		define _PATH_LOGPID _PATH_VARRUN SYSLOGD_PIDNAME
-#	else
-#		define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME
-#	endif
-#else
-#	ifndef _PATH_LOGPID
-#		if defined(__sun) || defined(__hpux)
-#			define _PATH_VARRUN "/var/run/"
-#		endif
-#		if defined(FSSTND)
-#			define _PATH_LOGPID _PATH_VARRUN "rsyslogd.pid"
-#		else
-#			define _PATH_LOGPID "/etc/rsyslogd.pid"
-#		endif
-#	endif
-#endif
-
-#ifndef _PATH_DEV
-#	define _PATH_DEV	"/dev/"
-#endif
-
-#ifndef _PATH_CONSOLE
-#define _PATH_CONSOLE	"/dev/console"
-#endif
-
-#ifndef _PATH_TTY
-#define _PATH_TTY	"/dev/tty"
-#endif
-
-static uchar	*ConfFile = (uchar*) _PATH_LOGCONF; /* read-only after startup */
-static char	*PidFile = _PATH_LOGPID; /* read-only after startup */
-char	ctty[] = _PATH_CONSOLE;	/* this is read-only; used by omfile -- TODO: remove that dependency */
-
-static pid_t myPid;	/* our pid for use in self-generated messages, e.g. on startup */
-/* mypid is read-only after the initial fork() */
-static int restart = 0; /* do restart (config read) - multithread safe */
-
-int glblHadMemShortage = 0; /* indicates if we had memory shortage some time during the run */
-
-
-static int bParseHOSTNAMEandTAG = 1; /* global config var: should the hostname and tag be
-                                      * parsed inside message - rgerhards, 2006-03-13 */
-static int bFinished = 0;	/* used by termination signal handler, read-only except there
-				 * is either 0 or the number of the signal that requested the
- 				 * termination.
-				 */
-
-/* Intervals at which we flush out "message repeated" messages,
- * in seconds after previous message is logged.  After each flush,
- * we move to the next interval until we reach the largest.
- * TODO: this shall go into action object! -- rgerhards, 2008-01-29
- */
-int	repeatinterval[2] = { 30, 60 };	/* # of secs before flush */
-
-#define LIST_DELIMITER	':'		/* delimiter between two hosts */
-
-struct	filed *Files = NULL; /* read-only after init() (but beware of sigusr1!) */
-
-static pid_t ppid; /* This is a quick and dirty hack used for spliting main/startup thread */
-
-typedef struct legacyOptsLL_s {
-	uchar *line;
-	struct legacyOptsLL_s *next;
-} legacyOptsLL_t;
-legacyOptsLL_t *pLegacyOptsLL = NULL;
-
-/* global variables for config file state */
-static int	bDropTrailingLF = 1; /* drop trailing LF's on reception? */
-int	iCompatibilityMode = 0;		/* version we should be compatible with; 0 means sysklogd. It is
-					   the default, so if no -c<n> option is given, we make ourselvs
-					   as compatible to sysklogd as possible. */
-static int	bDebugPrintTemplateList = 1;/* output template list in debug mode? */
-static int	bDebugPrintCfSysLineHandlerList = 1;/* output cfsyslinehandler list in debug mode? */
-static int	bDebugPrintModuleList = 1;/* output module list in debug mode? */
-int	bDropMalPTRMsgs = 0;/* Drop messages which have malicious PTR records during DNS lookup */
-static uchar	cCCEscapeChar = '\\';/* character to be used to start an escape sequence for control chars */
-static int 	bEscapeCCOnRcv = 1; /* escape control characters on reception: 0 - no, 1 - yes */
-int 	bReduceRepeatMsgs; /* reduce repeated message - 0 - no, 1 - yes */
-int	bActExecWhenPrevSusp; /* execute action only when previous one was suspended? */
-int	iActExecOnceInterval = 0; /* execute action once every nn seconds */
-uchar *pszWorkDir = NULL;/* name of rsyslog's spool directory (without trailing slash) */
-uchar *glblModPath = NULL; /* module load path  - only used during initial init, only settable via -M command line option */
-/* end global config file state variables */
-
-uchar	*LocalHostName;/* our hostname  - read-only after startup */
-char	*LocalDomain;	/* our local domain name  - read-only after startup */
-int	MarkInterval = 20 * 60;	/* interval between marks in seconds - read-only after startup */
-int      family = PF_UNSPEC;     /* protocol family (IPv4, IPv6 or both), set via cmdline */
-int      send_to_all = 0;        /* send message to all IPv4/IPv6 addresses */
-static int	NoFork = 0; 	/* don't fork - don't run in daemon mode - read-only after startup */
-int	DisableDNS = 0; /* don't look up IP addresses of remote messages */
-char	**StripDomains = NULL;/* these domains may be stripped before writing logs  - r/o after s.u., never touched by init */
-char	**LocalHosts = NULL;/* these hosts are logged with their hostname  - read-only after startup, never touched by init */
-static int	bHaveMainQueue = 0;/* set to 1 if the main queue - in queueing mode - is available
-				 * If the main queue is either not yet ready or not running in 
-				 * queueing mode (mode DIRECT!), then this is set to 0.
-				 */
-
-extern	int errno;
-
-/* main message queue and its configuration parameters */
-static queue_t *pMsgQueue = NULL;				/* the main message queue */
-static int iMainMsgQueueSize = 10000;				/* size of the main message queue above */
-static int iMainMsgQHighWtrMark = 8000;				/* high water mark for disk-assisted queues */
-static int iMainMsgQLowWtrMark = 2000;				/* low water mark for disk-assisted queues */
-static int iMainMsgQDiscardMark = 9800;				/* begin to discard messages */
-static int iMainMsgQDiscardSeverity = 8;			/* by default, discard nothing to prevent unintentional loss */
-static int iMainMsgQueueNumWorkers = 1;				/* number of worker threads for the mm queue above */
-static queueType_t MainMsgQueType = QUEUETYPE_FIXED_ARRAY;	/* type of the main message queue above */
-static uchar *pszMainMsgQFName = NULL;				/* prefix for the main message queue file */
-static int64 iMainMsgQueMaxFileSize = 1024*1024;
-static int iMainMsgQPersistUpdCnt = 0;				/* persist queue info every n updates */
-static int iMainMsgQtoQShutdown = 0;				/* queue shutdown */ 
-static int iMainMsgQtoActShutdown = 1000;			/* action shutdown (in phase 2) */ 
-static int iMainMsgQtoEnq = 2000;				/* timeout for queue enque */ 
-static int iMainMsgQtoWrkShutdown = 60000;			/* timeout for worker thread shutdown */
-static int iMainMsgQWrkMinMsgs = 100;				/* minimum messages per worker needed to start a new one */
-static int iMainMsgQDeqSlowdown = 0;				/* dequeue slowdown (simple rate limiting) */
-static int64 iMainMsgQueMaxDiskSpace = 0;			/* max disk space allocated 0 ==> unlimited */
-static int bMainMsgQSaveOnShutdown = 1;				/* save queue on shutdown (when DA enabled)? */
-static int iMainMsgQueueDeqtWinFromHr = 0;			/* hour begin of time frame when queue is to be dequeued */
-static int iMainMsgQueueDeqtWinToHr = 25;			/* hour begin of time frame when queue is to be dequeued */
-
-
-/* support for simple textual representation of FIOP names
- * rgerhards, 2005-09-27
- */
-static char* getFIOPName(unsigned iFIOP)
-{
-	char *pRet;
-	switch(iFIOP) {
-		case FIOP_CONTAINS:
-			pRet = "contains";
-			break;
-		case FIOP_ISEQUAL:
-			pRet = "isequal";
-			break;
-		case FIOP_STARTSWITH:
-			pRet = "startswith";
-			break;
-		case FIOP_REGEX:
-			pRet = "regex";
-			break;
-		default:
-			pRet = "NOP";
-			break;
-	}
-	return pRet;
-}
-
-
-/* Reset config variables to default values.
- * rgerhards, 2007-07-17
- */
-static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal)
-{
-	cCCEscapeChar = '#';
-	bActExecWhenPrevSusp = 0;
-	iActExecOnceInterval = 0;
-	bDebugPrintTemplateList = 1;
-	bDebugPrintCfSysLineHandlerList = 1;
-	bDebugPrintModuleList = 1;
-	bEscapeCCOnRcv = 1; /* default is to escape control characters */
-	bReduceRepeatMsgs = 0;
-	bDropMalPTRMsgs = 0;
-	if(pszWorkDir != NULL) {
-		free(pszWorkDir);
-		pszWorkDir = NULL;
-	}
-	if(pszMainMsgQFName != NULL) {
-		free(pszMainMsgQFName);
-		pszMainMsgQFName = NULL;
-	}
-	iMainMsgQueueSize = 10000;
-	iMainMsgQHighWtrMark = 8000;
-	iMainMsgQLowWtrMark = 2000;
-	iMainMsgQDiscardMark = 9800;
-	iMainMsgQDiscardSeverity = 4;
-	iMainMsgQueMaxFileSize = 1024 * 1024;
-	iMainMsgQueueNumWorkers = 1;
-	iMainMsgQPersistUpdCnt = 0;
-	iMainMsgQtoQShutdown = 0;
-	iMainMsgQtoActShutdown = 1000;
-	iMainMsgQtoEnq = 2000;
-	iMainMsgQtoWrkShutdown = 60000;
-	iMainMsgQWrkMinMsgs = 100;
-	iMainMsgQDeqSlowdown = 0;
-	bMainMsgQSaveOnShutdown = 1;
-	MainMsgQueType = QUEUETYPE_FIXED_ARRAY;
-	iMainMsgQueMaxDiskSpace = 0;
-	glbliActionResumeRetryCount = 0;
-
-	return RS_RET_OK;
-}
-
-
-
-int option_DisallowWarning = 1;	/* complain if message from disallowed sender is received */
-
-
-/* hardcoded standard templates (used for defaults) */
-static uchar template_SyslogProtocol23Format[] = "\"<%PRI%>1 %TIMESTAMP:::date-rfc3339% %HOSTNAME% %APP-NAME% %PROCID% %MSGID% %STRUCTURED-DATA% %msg%\n\"";
-static uchar template_TraditionalFileFormat[] = "\"%TIMESTAMP% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n\"";
-static uchar template_FileFormat[] = "\"%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n\"";
-static uchar template_WallFmt[] = "\"\r\n\7Message from syslogd@%HOSTNAME% at %timegenerated% ...\r\n %syslogtag%%msg%\n\r\"";
-static uchar template_ForwardFormat[] = "\"<%PRI%>%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag:1:32%%msg%\"";
-static uchar template_TraditionalForwardFormat[] = "\"<%PRI%>%TIMESTAMP% %HOSTNAME% %syslogtag:1:32%%msg%\"";
-static uchar template_StdUsrMsgFmt[] = "\" %syslogtag%%msg%\n\r\"";
-static uchar template_StdDBFmt[] = "\"insert into SystemEvents (Message, Facility, FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, '%timereported:::date-mysql%', '%timegenerated:::date-mysql%', %iut%, '%syslogtag%')\",SQL";
-static uchar template_StdPgSQLFmt[] = "\"insert into SystemEvents (Message, Facility, FromHost, Priority, DeviceReportedTime, ReceivedAt, InfoUnitID, SysLogTag) values ('%msg%', %syslogfacility%, '%HOSTNAME%', %syslogpriority%, '%timereported:::date-pgsql%', '%timegenerated:::date-pgsql%', %iut%, '%syslogtag%')\",STDSQL";
-/* end template */
-
-
-/* up to the next comment, prototypes that should be removed by reordering */
-/* Function prototypes. */
-static char **crunch_list(char *list);
-static void reapchild();
-static void debug_switch();
-static void sighup_handler();
-static void freeSelectors(void);
-static void processImInternal(void);
-
-
-static int usage(void)
-{
-	fprintf(stderr, "usage: rsyslogd [-cversion] [-46AdnqQvwx] [-lhostlist] [-sdomainlist]\n"
-			"                [-fconffile] [-ipidfile]\n"
-			"To run rsyslogd in native mode, use \"rsyslogd -c3 <other options>\"\n\n"
-			"For further information see http://www.rsyslog.com/doc\n");
-	exit(1); /* "good" exit - done to terminate usage() */
-}
-
-
-/* function to destruct a selector_t object
- * rgerhards, 2007-08-01
- */
-rsRetVal
-selectorDestruct(void *pVal)
-{
-	selector_t *pThis = (selector_t *) pVal;
-
-	assert(pThis != NULL);
-
-	if(pThis->pCSHostnameComp != NULL)
-		rsCStrDestruct(&pThis->pCSHostnameComp);
-	if(pThis->pCSProgNameComp != NULL)
-		rsCStrDestruct(&pThis->pCSProgNameComp);
-
-	if(pThis->f_filter_type == FILTER_PROP) {
-		if(pThis->f_filterData.prop.pCSPropName != NULL)
-			rsCStrDestruct(&pThis->f_filterData.prop.pCSPropName);
-		if(pThis->f_filterData.prop.pCSCompValue != NULL)
-			rsCStrDestruct(&pThis->f_filterData.prop.pCSCompValue);
-	} else if(pThis->f_filter_type == FILTER_EXPR) {
-		if(pThis->f_filterData.f_expr != NULL)
-			expr.Destruct(&pThis->f_filterData.f_expr);
-	}
-
-	llDestroy(&pThis->llActList);
-	free(pThis);
-	
-	return RS_RET_OK;
-}
-
-
-/* function to construct a selector_t object
- * rgerhards, 2007-08-01
- */
-rsRetVal
-selectorConstruct(selector_t **ppThis)
-{
-	DEFiRet;
-	selector_t *pThis;
-
-	assert(ppThis != NULL);
-	
-	if((pThis = (selector_t*) calloc(1, sizeof(selector_t))) == NULL) {
-		glblHadMemShortage = 1;
-		ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-	}
-	CHKiRet(llInit(&pThis->llActList, actionDestruct, NULL, NULL));
-
-finalize_it:
-	if(iRet != RS_RET_OK) {
-		if(pThis != NULL) {
-			selectorDestruct(pThis);
-		}
-	}
-	*ppThis = pThis;
-	RETiRet;
-}
-
-
-/* rgerhards, 2005-10-24: crunch_list is called only during option processing. So
- * it is never called once rsyslogd is running (not even when HUPed). This code
- * contains some exits, but they are considered safe because they only happen
- * during startup. Anyhow, when we review the code here, we might want to
- * reconsider the exit()s.
- */
-static char **crunch_list(char *list)
-{
-	int count, i;
-	char *p, *q;
-	char **result = NULL;
-
-	p = list;
-	
-	/* strip off trailing delimiters */
-	while (p[strlen(p)-1] == LIST_DELIMITER) {
-		count--;
-		p[strlen(p)-1] = '\0';
-	}
-	/* cut off leading delimiters */
-	while (p[0] == LIST_DELIMITER) {
-		count--;
-		p++; 
-	}
-	
-	/* count delimiters to calculate elements */
-	for (count=i=0; p[i]; i++)
-		if (p[i] == LIST_DELIMITER) count++;
-	
-	if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) {
-		printf ("Sorry, can't get enough memory, exiting.\n");
-		exit(0); /* safe exit, because only called during startup */
-	}
-	
-	/*
-	 * We now can assume that the first and last
-	 * characters are different from any delimiters,
-	 * so we don't have to care about this.
-	 */
-	count = 0;
-	while ((q=strchr(p, LIST_DELIMITER))) {
-		result[count] = (char *) malloc((q - p + 1) * sizeof(char));
-		if (result[count] == NULL) {
-			printf ("Sorry, can't get enough memory, exiting.\n");
-			exit(0); /* safe exit, because only called during startup */
-		}
-		strncpy(result[count], p, q - p);
-		result[count][q - p] = '\0';
-		p = q; p++;
-		count++;
-	}
-	if ((result[count] = \
-	     (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) {
-		printf ("Sorry, can't get enough memory, exiting.\n");
-		exit(0); /* safe exit, because only called during startup */
-	}
-	strcpy(result[count],p);
-	result[++count] = NULL;
-
-#if 0
-	count=0;
-	while (result[count])
-		dbgprintf("#%d: %s\n", count, StripDomains[count++]);
-#endif
-	return result;
-}
-
-
-void untty(void)
-#ifdef HAVE_SETSID
-{
-	if ( !Debug ) {
-		setsid();
-	}
-	return;
-}
-#else
-{
-	int i;
-
-	if ( !Debug ) {
-		i = open(_PATH_TTY, O_RDWR);
-		if (i >= 0) {
-#			if !defined(__hpux)
-				(void) ioctl(i, (int) TIOCNOTTY, (char *)0);
-#			else
-				/* TODO: we need to implement something for HP UX! -- rgerhards, 2008-03-04 */
-				/* actually, HP UX should have setsid, so the code directly above should
-				 * trigger. So the actual question is why it doesn't do that...
-				 */
-#			endif
-			(void) close(i);
-		}
-	}
-}
-#endif
-
-
-/* Take a raw input line, decode the message, and print the message
- * on the appropriate log files.
- * rgerhards 2004-11-08: Please note
- * that this function does only a partial decoding. At best, it splits 
- * the PRI part. No further decode happens. The rest is done in 
- * logmsg().
- * Added the iSource parameter so that we know if we have to parse
- * HOSTNAME or not. rgerhards 2004-11-16.
- * changed parameter iSource to bParseHost. For details, see comment in
- * printchopped(). rgerhards 2005-10-06
- * rgerhards: 2008-03-06: added "flags" to allow an input module to specify
- * flags, most importantly to request ignoring the messages' timestamp.
- *
- * rgerhards, 2008-03-19:
- * I added an additional calling parameter to permit specifying the flow
- * control capability of the source.
- */
-rsRetVal printline(char *hname, char *msg, int bParseHost, int flags, flowControl_t flowCtlType)
-{
-	DEFiRet;
-	register char *p;
-	int pri;
-	msg_t *pMsg;
-
-	/* Now it is time to create the message object (rgerhards)
-	*/
-	CHKiRet(msgConstruct(&pMsg));
-	MsgSetFlowControlType(pMsg, flowCtlType);
-	MsgSetRawMsg(pMsg, msg);
-	
-	pMsg->bParseHOSTNAME  = bParseHost;
-	/* test for special codes */
-	pri = DEFUPRI;
-	p = msg;
-	if (*p == '<') {
-		pri = 0;
-		while (isdigit((int) *++p))
-		{
-		   pri = 10 * pri + (*p - '0');
-		}
-		if (*p == '>')
-			++p;
-	}
-	if (pri &~ (LOG_FACMASK|LOG_PRIMASK))
-		pri = DEFUPRI;
-	pMsg->iFacility = LOG_FAC(pri);
-	pMsg->iSeverity = LOG_PRI(pri);
-
-	/* Now we look at the HOSTNAME. That is a bit complicated...
-	 * If we have a locally received message, it does NOT
-	 * contain any hostname information in the message itself.
-	 * As such, the HOSTNAME is the same as the system that
-	 * the message was received from (that, for obvious reasons,
-	 * being the local host).  rgerhards 2004-11-16
-	 */
-	if(bParseHost == 0)
-		MsgSetHOSTNAME(pMsg, hname);
-	MsgSetRcvFrom(pMsg, hname);
-
-	/* rgerhards 2004-11-19: well, well... we've now seen that we
-	 * have the "hostname problem" also with the traditional Unix
-	 * message. As we like to emulate it, we need to add the hostname
-	 * to it.
-	 */
-	if(MsgSetUxTradMsg(pMsg, p) != 0)
-		ABORT_FINALIZE(RS_RET_ERR);
-
-	logmsg(pMsg, flags | SYNC_FILE);
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* This takes a received message that must be decoded and submits it to
- * the main message queue. The function calls the necessary parser.
- *
- * rgerhards, 2006-11-30: I have greatly changed this function. Formerly,
- * it tried to reassemble multi-part messages, which is a legacy stock
- * sysklogd concept. In essence, that was that messages not ending with
- * \0 were glued together. As far as I can see, this is a sysklogd
- * specific feature and, from looking at the code, seems to be used
- * pretty seldom (if at all). I remove this now, not the least because it is totally
- * incompatible with upcoming IETF syslog standards. If you experience
- * strange behaviour with messages beeing split across multiple lines,
- * this function here might be the place to look at.
- *
- * Some previous history worth noting:
- * I added the "iSource" parameter. This is needed to distinguish between
- * messages that have a hostname in them (received from the internet) and
- * those that do not have (most prominently /dev/log).  rgerhards 2004-11-16
- * And now I removed the "iSource" parameter and changed it to be "bParseHost",
- * because all that it actually controls is whether the host is parsed or not.
- * For rfc3195 support, we needed to modify the algo for host parsing, so we can
- * no longer rely just on the source (rfc3195d forwarded messages arrive via
- * unix domain sockets but contain the hostname). rgerhards, 2005-10-06
- *
- * rgerhards, 2008-02-18:
- * This function was previously called "printchopped"() and has been renamed
- * as part of the effort to create a clean internal message submission interface.
- * It also has been adopted to our usual calling interface, but currently does
- * not provide any useful return states. But we now have the hook and things can
- * improve in the future. <-- TODO!
- *
- * rgerhards, 2008-03-19:
- * I added an additional calling parameter to permit specifying the flow
- * control capability of the source.
- */
-rsRetVal
-parseAndSubmitMessage(char *hname, char *msg, int len, int bParseHost, int flags, flowControl_t flowCtlType)
-{
-	DEFiRet;
-	register int iMsg;
-	char *pMsg;
-	char *pData;
-	char *pEnd;
-	char tmpline[MAXLINE + 1];
-#	ifdef USE_NETZIP
-	char deflateBuf[MAXLINE + 1];
-	uLongf iLenDefBuf;
-#	endif
-
-	assert(hname != NULL);
-	assert(msg != NULL);
-	assert(len >= 0);
-
-	/* we first check if we have a NUL character at the very end of the
-	 * message. This seems to be a frequent problem with a number of senders.
-	 * So I have now decided to drop these NULs. However, if they are intentional,
-	 * that may cause us some problems, e.g. with syslog-sign. On the other hand,
-	 * current code always has problems with intentional NULs (as it needs to escape
-	 * them to prevent problems with the C string libraries), so that does not
-	 * really matter. Just to be on the save side, we'll log destruction of such
-	 * NULs in the debug log.
-	 * rgerhards, 2007-09-14
-	 */
-	if(*(msg + len - 1) == '\0') {
-		dbgprintf("dropped NUL at very end of message\n");
-		len--;
-	}
-
-	/* then we check if we need to drop trailing LFs, which often make
-	 * their way into syslog messages unintentionally. In order to remain
-	 * compatible to recent IETF developments, we allow the user to
-	 * turn on/off this handling.  rgerhards, 2007-07-23
-	 */
-	if(bDropTrailingLF && *(msg + len - 1) == '\n') {
-		dbgprintf("dropped LF at very end of message (DropTrailingLF is set)\n");
-		len--;
-	}
-
-	iMsg = 0;	/* initialize receiving buffer index */
-	pMsg = tmpline; /* set receiving buffer pointer */
-	pData = msg;	/* set source buffer pointer */
-	pEnd = msg + len; /* this is one off, which is intensional */
-
-#	ifdef USE_NETZIP
-	/* we first need to check if we have a compressed record. If so,
-	 * we must decompress it.
-	 */
-	if(len > 0 && *msg == 'z') { /* compressed data present? (do NOT change order if conditions!) */
-		/* we have compressed data, so let's deflate it. We support a maximum
-		 * message size of MAXLINE. If it is larger, an error message is logged
-		 * and the message is dropped. We do NOT try to decompress larger messages
-		 * as such might be used for denial of service. It might happen to later
-		 * builds that such functionality be added as an optional, operator-configurable
-		 * feature.
-		 */
-		int ret;
-		iLenDefBuf = MAXLINE;
-		ret = uncompress((uchar *) deflateBuf, &iLenDefBuf, (uchar *) msg+1, len-1);
-		dbgprintf("Compressed message uncompressed with status %d, length: new %ld, old %d.\n",
-		        ret, (long) iLenDefBuf, len-1);
-		/* Now check if the uncompression worked. If not, there is not much we can do. In
-		 * that case, we log an error message but ignore the message itself. Storing the
-		 * compressed text is dangerous, as it contains control characters. So we do
-		 * not do this. If someone would like to have a copy, this code here could be
-		 * modified to do a hex-dump of the buffer in question. We do not include
-		 * this functionality right now.
-		 * rgerhards, 2006-12-07
-		 */
-		if(ret != Z_OK) {
-			errmsg.LogError(NO_ERRCODE, "Uncompression of a message failed with return code %d "
-			            "- enable debug logging if you need further information. "
-				    "Message ignored.", ret);
-			FINALIZE; /* unconditional exit, nothing left to do... */
-		}
-		pData = deflateBuf;
-		pEnd = deflateBuf + iLenDefBuf;
-	}
-#	else /* ifdef USE_NETZIP */
-	/* in this case, we still need to check if the message is compressed. If so, we must
-	 * tell the user we can not accept it.
-	 */
-	if(len > 0 && *msg == 'z') {
-		errmsg.LogError(NO_ERRCODE, "Received a compressed message, but rsyslogd does not have compression "
-		         "support enabled. The message will be ignored.");
-		FINALIZE;
-	}	
-#	endif /* ifdef USE_NETZIP */
-
-	while(pData < pEnd) {
-		if(iMsg >= MAXLINE) {
-			/* emergency, we now need to flush, no matter if
-			 * we are at end of message or not...
-			 */
-			if(iMsg == MAXLINE) {
-				*(pMsg + iMsg) = '\0'; /* space *is* reserved for this! */
-				printline(hname, tmpline, bParseHost, flags, flowCtlType);
-			} else {
-				/* This case in theory never can happen. If it happens, we have
-				 * a logic error. I am checking for it, because if I would not,
-				 * we would address memory invalidly with the code above. I
-				 * do not care much about this case, just a debug log entry
-				 * (I couldn't do any more smart things anyway...).
-				 * rgerhards, 2007-9-20
-				 */
-				dbgprintf("internal error: iMsg > MAXLINE in printchopped()\n");
-			}
-			FINALIZE; /* in this case, we are done... nothing left we can do */
-		}
-		if(*pData == '\0') { /* guard against \0 characters... */
-			/* changed to the sequence (somewhat) proposed in
-			 * draft-ietf-syslog-protocol-19. rgerhards, 2006-11-30
-			 */
-			if(iMsg + 3 < MAXLINE) { /* do we have space? */
-				*(pMsg + iMsg++) =  cCCEscapeChar;
-				*(pMsg + iMsg++) = '0';
-				*(pMsg + iMsg++) = '0';
-				*(pMsg + iMsg++) = '0';
-			} /* if we do not have space, we simply ignore the '\0'... */
-			  /* log an error? Very questionable... rgerhards, 2006-11-30 */
-			  /* decided: we do not log an error, it won't help... rger, 2007-06-21 */
-			++pData;
-		} else if(bEscapeCCOnRcv && iscntrl((int) *pData)) {
-			/* we are configured to escape control characters. Please note
-			 * that this most probably break non-western character sets like
-			 * Japanese, Korean or Chinese. rgerhards, 2007-07-17
-			 * Note: sysklogd logs octal values only for DEL and CCs above 127.
-			 * For others, it logs ^n where n is the control char converted to an
-			 * alphabet character. We like consistency and thus escape it to octal
-			 * in all cases. If someone complains, we may change the mode. At least
-			 * we known now what's going on.
-			 * rgerhards, 2007-07-17
-			 */
-			if(iMsg + 3 < MAXLINE) { /* do we have space? */
-				*(pMsg + iMsg++) = cCCEscapeChar;
-				*(pMsg + iMsg++) = '0' + ((*pData & 0300) >> 6);
-				*(pMsg + iMsg++) = '0' + ((*pData & 0070) >> 3);
-				*(pMsg + iMsg++) = '0' + ((*pData & 0007));
-			} /* again, if we do not have space, we ignore the char - see comment at '\0' */
-			++pData;
-		} else {
-			*(pMsg + iMsg++) = *pData++;
-		}
-	}
-
-	*(pMsg + iMsg) = '\0'; /* space *is* reserved for this! */
-
-	/* typically, we should end up here! */
-	printline(hname, tmpline, bParseHost, flags, flowCtlType);
-
-finalize_it:
-	RETiRet;
-}
-
-/* rgerhards 2004-11-09: the following is a function that can be used
- * to log a message orginating from the syslogd itself. In sysklogd code,
- * this is done by simply calling logmsg(). However, logmsg() is changed in
- * rsyslog so that it takes a msg "object". So it can no longer be called
- * directly. This method here solves the need. It provides an interface that
- * allows to construct a locally-generated message. Please note that this
- * function here probably is only an interim solution and that we need to
- * think on the best way to do this.
- */
-rsRetVal
-logmsgInternal(int pri, char *msg, int flags)
-{
-	DEFiRet;
-	msg_t *pMsg;
-
-	CHKiRet(msgConstruct(&pMsg));
-	MsgSetUxTradMsg(pMsg, msg);
-	MsgSetRawMsg(pMsg, msg);
-	MsgSetHOSTNAME(pMsg, (char*)LocalHostName);
-	MsgSetRcvFrom(pMsg, (char*)LocalHostName);
-	MsgSetTAG(pMsg, "rsyslogd:");
-	pMsg->iFacility = LOG_FAC(pri);
-	pMsg->iSeverity = LOG_PRI(pri);
-	pMsg->bParseHOSTNAME = 0;
-	datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
-	flags |= INTERNAL_MSG;
-
-	if(bHaveMainQueue == 0) { /* not yet in queued mode */
-		iminternalAddMsg(pri, pMsg, flags);
-	} else {
-		/* we have the queue, so we can simply provide the 
-		 * message to the queue engine.
-		 */
-		logmsg(pMsg, flags);
-	}
-finalize_it:
-	RETiRet;
-}
-
-/* This functions looks at the given message and checks if it matches the
- * provided filter condition. If so, it returns true, else it returns
- * false. This is a helper to logmsg() and meant to drive the decision
- * process if a message is to be processed or not. As I expect this
- * decision code to grow more complex over time AND logmsg() is already
- * a very lengthy function, I thought a separate function is more appropriate.
- * 2005-09-19 rgerhards
- * 2008-02-25 rgerhards: changed interface, now utilizes iRet, bProcessMsg
- * returns is message should be procesed.
- */
-static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProcessMsg)
-{
-	DEFiRet;
-	unsigned short pbMustBeFreed;
-	char *pszPropVal;
-	int bRet = 0;
-	vm_t *pVM = NULL;
-	var_t *pResult = NULL;
-
-	assert(f != NULL);
-	assert(pMsg != NULL);
-
-	/* we first have a look at the global, BSD-style block filters (for tag
-	 * and host). Only if they match, we evaluate the actual filter.
-	 * rgerhards, 2005-10-18
-	 */
-	if(f->eHostnameCmpMode == HN_NO_COMP) {
-		/* EMPTY BY INTENSION - we check this value first, because
-		 * it is the one most often used, so this saves us time!
-		 */
-	} else if(f->eHostnameCmpMode == HN_COMP_MATCH) {
-		if(rsCStrSzStrCmp(f->pCSHostnameComp, (uchar*) getHOSTNAME(pMsg), getHOSTNAMELen(pMsg))) {
-			/* not equal, so we are already done... */
-			dbgprintf("hostname filter '+%s' does not match '%s'\n", 
-				rsCStrGetSzStrNoNULL(f->pCSHostnameComp), getHOSTNAME(pMsg));
-			FINALIZE;
-		}
-	} else { /* must be -hostname */
-		if(!rsCStrSzStrCmp(f->pCSHostnameComp, (uchar*) getHOSTNAME(pMsg), getHOSTNAMELen(pMsg))) {
-			/* not equal, so we are already done... */
-			dbgprintf("hostname filter '-%s' does not match '%s'\n", 
-				rsCStrGetSzStrNoNULL(f->pCSHostnameComp), getHOSTNAME(pMsg));
-			FINALIZE;
-		}
-	}
-	
-	if(f->pCSProgNameComp != NULL) {
-		int bInv = 0, bEqv = 0, offset = 0;
-		if(*(rsCStrGetSzStrNoNULL(f->pCSProgNameComp)) == '-') {
-			if(*(rsCStrGetSzStrNoNULL(f->pCSProgNameComp) + 1) == '-')
-				offset = 1;
-			else {
-				bInv = 1;
-				offset = 1;
-			}
-		}
-		if(!rsCStrOffsetSzStrCmp(f->pCSProgNameComp, offset, (uchar*) getProgramName(pMsg), getProgramNameLen(pMsg)))
-			bEqv = 1;
-
-		if((!bEqv && !bInv) || (bEqv && bInv)) {
-			/* not equal or inverted selection, so we are already done... */
-			dbgprintf("programname filter '%s' does not match '%s'\n", 
-				rsCStrGetSzStrNoNULL(f->pCSProgNameComp), getProgramName(pMsg));
-			FINALIZE;
-		}
-	}
-	
-	/* done with the BSD-style block filters */
-
-	if(f->f_filter_type == FILTER_PRI) {
-		/* skip messages that are incorrect priority */
-		if ( (f->f_filterData.f_pmask[pMsg->iFacility] == TABLE_NOPRI) || \
-		    ((f->f_filterData.f_pmask[pMsg->iFacility] & (1<<pMsg->iSeverity)) == 0) )
-			bRet = 0;
-		else
-			bRet = 1;
-	} else if(f->f_filter_type == FILTER_EXPR) {
-		CHKiRet(vm.Construct(&pVM));
-		CHKiRet(vm.ConstructFinalize(pVM));
-		CHKiRet(vm.SetMsg(pVM, pMsg));
-		CHKiRet(vm.ExecProg(pVM, f->f_filterData.f_expr->pVmprg));
-		CHKiRet(vm.PopBoolFromStack(pVM, &pResult));
-		dbgprintf("result of expression evaluation: %lld\n", pResult->val.num);
-		/* VM is destructed on function exit */
-		bRet = (pResult->val.num) ? 1 : 0;
-	} else {
-		assert(f->f_filter_type == FILTER_PROP); /* assert() just in case... */
-		pszPropVal = MsgGetProp(pMsg, NULL, f->f_filterData.prop.pCSPropName, &pbMustBeFreed);
-
-		/* Now do the compares (short list currently ;)) */
-		switch(f->f_filterData.prop.operation ) {
-		case FIOP_CONTAINS:
-			if(rsCStrLocateInSzStr(f->f_filterData.prop.pCSCompValue, (uchar*) pszPropVal) != -1)
-				bRet = 1;
-			break;
-		case FIOP_ISEQUAL:
-			if(rsCStrSzStrCmp(f->f_filterData.prop.pCSCompValue,
-					  (uchar*) pszPropVal, strlen(pszPropVal)) == 0)
-				bRet = 1; /* process message! */
-			break;
-		case FIOP_STARTSWITH:
-			if(rsCStrSzStrStartsWithCStr(f->f_filterData.prop.pCSCompValue,
-					  (uchar*) pszPropVal, strlen(pszPropVal)) == 0)
-				bRet = 1; /* process message! */
-			break;
-		case FIOP_REGEX:
-			if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue,
-					  (unsigned char*) pszPropVal) == 0)
-				bRet = 1;
-			break;
-		default:
-			/* here, it handles NOP (for performance reasons) */
-			assert(f->f_filterData.prop.operation == FIOP_NOP);
-			bRet = 1; /* as good as any other default ;) */
-			break;
-		}
-
-		/* now check if the value must be negated */
-		if(f->f_filterData.prop.isNegated)
-			bRet = (bRet == 1) ?  0 : 1;
-
-		if(Debug) {
-			dbgprintf("Filter: check for property '%s' (value '%s') ",
-			        rsCStrGetSzStrNoNULL(f->f_filterData.prop.pCSPropName),
-			        pszPropVal);
-			if(f->f_filterData.prop.isNegated)
-				dbgprintf("NOT ");
-			dbgprintf("%s '%s': %s\n",
-			       getFIOPName(f->f_filterData.prop.operation),
-			       rsCStrGetSzStrNoNULL(f->f_filterData.prop.pCSCompValue),
-			       bRet ? "TRUE" : "FALSE");
-		}
-
-		/* cleanup */
-		if(pbMustBeFreed)
-			free(pszPropVal);
-	}
-
-finalize_it:
-	/* destruct in any case, not just on error, but it makes error handling much easier */
-	if(pVM != NULL)
-		vm.Destruct(&pVM);
-
-	if(pResult != NULL)
-		var.Destruct(&pResult);
-
-	*bProcessMsg = bRet;
-	RETiRet;
-}
-
-
-/* helper to processMsg(), used to call the configured actions. It is
- * executed from within llExecFunc() of the action list.
- * rgerhards, 2007-08-02
- */
-typedef struct processMsgDoActions_s {
-	int bPrevWasSuspended; /* was the previous action suspended? */
-	msg_t *pMsg;
-} processMsgDoActions_t;
-DEFFUNC_llExecFunc(processMsgDoActions)
-{
-	DEFiRet;
-	rsRetVal iRetMod;	/* return value of module - we do not always pass that back */
-	action_t *pAction = (action_t*) pData;
-	processMsgDoActions_t *pDoActData = (processMsgDoActions_t*) pParam;
-
-	assert(pAction != NULL);
-
-	if((pAction->bExecWhenPrevSusp  == 1) && (pDoActData->bPrevWasSuspended == 0)) {
-		dbgprintf("not calling action because the previous one is not suspended\n");
-		ABORT_FINALIZE(RS_RET_OK);
-	}
-
-	iRetMod = actionCallAction(pAction, pDoActData->pMsg);
-	if(iRetMod == RS_RET_DISCARDMSG) {
-		ABORT_FINALIZE(RS_RET_DISCARDMSG);
-	} else if(iRetMod == RS_RET_SUSPENDED) {
-		/* indicate suspension for next module to be called */
-		pDoActData->bPrevWasSuspended = 1;
-	} else {
-		pDoActData->bPrevWasSuspended = 0;
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* Process (consume) a received message. Calls the actions configured.
- * rgerhards, 2005-10-13
- */
-static void
-processMsg(msg_t *pMsg)
-{
-	selector_t *f;
-	int bContinue;
-	int bProcessMsg;
-	processMsgDoActions_t DoActData;
-	rsRetVal iRet;
-
-	BEGINfunc
-	assert(pMsg != NULL);
-
-	/* log the message to the particular outputs */
-
-	bContinue = 1;
-	for (f = Files; f != NULL && bContinue ; f = f->f_next) {
-		/* first check the filters... */
-		iRet = shouldProcessThisMessage(f, pMsg, &bProcessMsg);
-		if(!bProcessMsg) {
-			continue;
-		}
-
-		/* ok -- from here, we have action-specific code, nothing really selector-specific -- rger 2007-08-01 */
-		DoActData.pMsg = pMsg;
-		DoActData.bPrevWasSuspended = 0;
-		if(llExecFunc(&f->llActList, processMsgDoActions, (void*)&DoActData) == RS_RET_DISCARDMSG)
-			bContinue = 0;
-	}
-	ENDfunc
-}
-
-
-/* The consumer of dequeued messages. This function is called by the
- * queue engine on dequeueing of a message. It runs on a SEPARATE
- * THREAD.
- * NOTE: Having more than one worker requires guarding of some
- * message object structures and potentially others - need to be checked
- * before we support multiple worker threads on the message queue.
- * Please note: the message object is destructed by the queue itself!
- */
-static rsRetVal
-msgConsumer(void __attribute__((unused)) *notNeeded, void *pUsr)
-{
-	DEFiRet;
-	msg_t *pMsg = (msg_t*) pUsr;
-
-	assert(pMsg != NULL);
-
-	processMsg(pMsg);
-	msgDestruct(&pMsg);
-
-	RETiRet;
-}
-
-
-/* Helper to parseRFCSyslogMsg. This function parses a field up to
- * (and including) the SP character after it. The field contents is
- * returned in a caller-provided buffer. The parsepointer is advanced
- * to after the terminating SP. The caller must ensure that the 
- * provided buffer is large enough to hold the to be extracted value.
- * Returns 0 if everything is fine or 1 if either the field is not
- * SP-terminated or any other error occurs.
- * rger, 2005-11-24
- */
-static int parseRFCField(char **pp2parse, char *pResult)
-{
-	char *p2parse;
-	int iRet = 0;
-
-	assert(pp2parse != NULL);
-	assert(*pp2parse != NULL);
-	assert(pResult != NULL);
-
-	p2parse = *pp2parse;
-
-	/* this is the actual parsing loop */
-	while(*p2parse && *p2parse != ' ') {
-		*pResult++ = *p2parse++;
-	}
-
-	if(*p2parse == ' ')
-		++p2parse; /* eat SP, but only if not at end of string */
-	else
-		iRet = 1; /* there MUST be an SP! */
-	*pResult = '\0';
-
-	/* set the new parse pointer */
-	*pp2parse = p2parse;
-	return 0;
-}
-
-
-/* Helper to parseRFCSyslogMsg. This function parses the structured
- * data field of a message. It does NOT parse inside structured data,
- * just gets the field as whole. Parsing the single entities is left
- * to other functions. The parsepointer is advanced
- * to after the terminating SP. The caller must ensure that the 
- * provided buffer is large enough to hold the to be extracted value.
- * Returns 0 if everything is fine or 1 if either the field is not
- * SP-terminated or any other error occurs.
- * rger, 2005-11-24
- */
-static int parseRFCStructuredData(char **pp2parse, char *pResult)
-{
-	char *p2parse;
-	int bCont = 1;
-	int iRet = 0;
-
-	assert(pp2parse != NULL);
-	assert(*pp2parse != NULL);
-	assert(pResult != NULL);
-
-	p2parse = *pp2parse;
-
-	/* this is the actual parsing loop
-	 * Remeber: structured data starts with [ and includes any characters
-	 * until the first ] followed by a SP. There may be spaces inside
-	 * structured data. There may also be \] inside the structured data, which
-	 * do NOT terminate an element.
-	 */
-	if(*p2parse != '[')
-		return 1; /* this is NOT structured data! */
-
-	while(bCont) {
-		if(*p2parse == '\0') {
-			iRet = 1; /* this is not valid! */
-			bCont = 0;
-		} else if(*p2parse == '\\' && *(p2parse+1) == ']') {
-			/* this is escaped, need to copy both */
-			*pResult++ = *p2parse++;
-			*pResult++ = *p2parse++;
-		} else if(*p2parse == ']' && *(p2parse+1) == ' ') {
-			/* found end, just need to copy the ] and eat the SP */
-			*pResult++ = *p2parse;
-			p2parse += 2;
-			bCont = 0;
-		} else {
-			*pResult++ = *p2parse++;
-		}
-	}
-
-	if(*p2parse == ' ')
-		++p2parse; /* eat SP, but only if not at end of string */
-	else
-		iRet = 1; /* there MUST be an SP! */
-	*pResult = '\0';
-
-	/* set the new parse pointer */
-	*pp2parse = p2parse;
-	return 0;
-}
-
-/* parse a RFC-formatted syslog message. This function returns
- * 0 if processing of the message shall continue and 1 if something
- * went wrong and this messe should be ignored. This function has been
- * implemented in the effort to support syslog-protocol. Please note that
- * the name (parse *RFC*) stems from the hope that syslog-protocol will
- * some time become an RFC. Do not confuse this with informational
- * RFC 3164 (which is legacy syslog).
- *
- * currently supported format:
- *
- * <PRI>VERSION SP TIMESTAMP SP HOSTNAME SP APP-NAME SP PROCID SP MSGID SP [SD-ID]s SP MSG
- *
- * <PRI> is already stripped when this function is entered. VERSION already
- * has been confirmed to be "1", but has NOT been stripped from the message.
- *
- * rger, 2005-11-24
- */
-static int parseRFCSyslogMsg(msg_t *pMsg, int flags)
-{
-	char *p2parse;
-	char *pBuf;
-	int bContParse = 1;
-
-	assert(pMsg != NULL);
-	assert(pMsg->pszUxTradMsg != NULL);
-	p2parse = (char*) pMsg->pszUxTradMsg;
-
-	/* do a sanity check on the version and eat it */
-	assert(p2parse[0] == '1' && p2parse[1] == ' ');
-	p2parse += 2;
-
-	/* Now get us some memory we can use as a work buffer while parsing.
-	 * We simply allocated a buffer sufficiently large to hold all of the
-	 * message, so we can not run into any troubles. I think this is
-	 * more wise then to use individual buffers.
-	 */
-	if((pBuf = malloc(sizeof(char)* strlen(p2parse) + 1)) == NULL)
-		return 1;
-		
-	/* IMPORTANT NOTE:
-	 * Validation is not actually done below nor are any errors handled. I have
-	 * NOT included this for the current proof of concept. However, it is strongly
-	 * advisable to add it when this code actually goes into production.
-	 * rgerhards, 2005-11-24
-	 */
-
-	/* TIMESTAMP */
-	if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP),  &p2parse) == FALSE) {
-		dbgprintf("no TIMESTAMP detected!\n");
-		bContParse = 0;
-		flags |= ADDDATE;
-	}
-
-	if (flags & ADDDATE) {
-		datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
-	}
-
-	/* HOSTNAME */
-	if(bContParse) {
-		parseRFCField(&p2parse, pBuf);
-		MsgSetHOSTNAME(pMsg, pBuf);
-	} else {
-		/* we can not parse, so we get the system we
-		 * received the data from.
-		 */
-		MsgSetHOSTNAME(pMsg, getRcvFrom(pMsg));
-	}
-
-	/* APP-NAME */
-	if(bContParse) {
-		parseRFCField(&p2parse, pBuf);
-		MsgSetAPPNAME(pMsg, pBuf);
-	}
-
-	/* PROCID */
-	if(bContParse) {
-		parseRFCField(&p2parse, pBuf);
-		MsgSetPROCID(pMsg, pBuf);
-	}
-
-	/* MSGID */
-	if(bContParse) {
-		parseRFCField(&p2parse, pBuf);
-		MsgSetMSGID(pMsg, pBuf);
-	}
-
-	/* STRUCTURED-DATA */
-	if(bContParse) {
-		parseRFCStructuredData(&p2parse, pBuf);
-		MsgSetStructuredData(pMsg, pBuf);
-	}
-
-	/* MSG */
-	MsgSetMSG(pMsg, p2parse);
-
-	free(pBuf);
-	return 0; /* all ok */
-}
-
-
-/* parse a legay-formatted syslog message. This function returns
- * 0 if processing of the message shall continue and 1 if something
- * went wrong and this messe should be ignored. This function has been
- * implemented in the effort to support syslog-protocol.
- * rger, 2005-11-24
- * As of 2006-01-10, I am removing the logic to continue parsing only
- * when a valid TIMESTAMP is detected. Validity of other fields already
- * is ignored. This is due to the fact that the parser has grown smarter
- * and is now more able to understand different dialects of the syslog
- * message format. I do not expect any bad side effects of this change,
- * but I thought I log it in this comment.
- * rgerhards, 2006-01-10
- */
-static int parseLegacySyslogMsg(msg_t *pMsg, int flags)
-{
-	char *p2parse;
-	char *pBuf;
-	char *pWork;
-	cstr_t *pStrB;
-	int iCnt;
-	int bTAGCharDetected;
-
-	assert(pMsg != NULL);
-	assert(pMsg->pszUxTradMsg != NULL);
-	p2parse = (char*) pMsg->pszUxTradMsg;
-
-	/* Check to see if msg contains a timestamp. We stary trying with a
-	 * high-precision one...
-	 */
-	if(datetime.ParseTIMESTAMP3339(&(pMsg->tTIMESTAMP), &p2parse) == TRUE) {
-		/* we are done - parse pointer is moved by ParseTIMESTAMP3339 */;
-	} else if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), p2parse) == TRUE) {
-		p2parse += 16;
-	} else if(*p2parse == ' ') { /* try to see if it is slighly malformed - HP procurve seems to do that sometimes */
-		if(datetime.ParseTIMESTAMP3164(&(pMsg->tTIMESTAMP), p2parse+1) == TRUE) {
-			/* indeed, we got it! */
-			p2parse += 17;
-		} else {
-			flags |= ADDDATE;
-		}
-	} else {
-		flags |= ADDDATE;
-	}
-
-	/* here we need to check if the timestamp is valid. If it is not,
-	 * we can not continue to parse but must treat the rest as the 
-	 * MSG part of the message (as of RFC 3164).
-	 * rgerhards 2004-12-03
-	 */
-	if(flags & ADDDATE) {
-		datetime.getCurrTime(&(pMsg->tTIMESTAMP)); /* use the current time! */
-	}
-
-	/* rgerhards, 2006-03-13: next, we parse the hostname and tag. But we 
-	 * do this only when the user has not forbidden this. I now introduce some
-	 * code that allows a user to configure rsyslogd to treat the rest of the
-	 * message as MSG part completely. In this case, the hostname will be the
-	 * machine that we received the message from and the tag will be empty. This
-	 * is meant to be an interim solution, but for now it is in the code.
-	 */
-	if(bParseHOSTNAMEandTAG && !(flags & INTERNAL_MSG)) {
-		/* parse HOSTNAME - but only if this is network-received!
-		 * rger, 2005-11-14: we still have a problem with BSD messages. These messages
-		 * do NOT include a host name. In most cases, this leads to the TAG to be treated
-		 * as hostname and the first word of the message as the TAG. Clearly, this is not
-		 * of advantage ;) I think I have now found a way to handle this situation: there
-		 * are certain characters which are frequently used in TAG (e.g. ':'), which are
-		 * *invalid* in host names. So while parsing the hostname, I check for these characters.
-		 * If I find them, I set a simple flag but continue. After parsing, I check the flag.
-		 * If it was set, then we most probably do not have a hostname but a TAG. Thus, I change
-		 * the fields. I think this logic shall work with any type of syslog message.
-		 */
-		bTAGCharDetected = 0;
-		if(pMsg->bParseHOSTNAME) {
-			/* TODO: quick and dirty memory allocation */
-			/* the memory allocated is far too much in most cases. But on the plus side,
-			 * it is quite fast... - rgerhards, 2007-09-20
-			 */
-			if((pBuf = malloc(sizeof(char)* (strlen(p2parse) +1))) == NULL)
-				return 1;
-			pWork = pBuf;
-			/* this is the actual parsing loop */
-			while(*p2parse && *p2parse != ' ' && *p2parse != ':') {
-				if(*p2parse == '[' || *p2parse == ']' || *p2parse == '/')
-					bTAGCharDetected = 1;
-				*pWork++ = *p2parse++;
-			}
-			/* we need to handle ':' seperately, because it terminates the
-			 * TAG - so we also need to terminate the parser here!
-			 * rgerhards, 2007-09-10 *p2parse points to a valid address here in 
-			 * any case. We can reach this point only if we are at end of string,
-			 * or we have a ':' or ' '. What the if below does is check if we are
-			 * not at end of string and, if so, advance the parse pointer. If we 
-			 * are already at end of string, *p2parse is equal to '\0', neither if
-			 * will be true and the parse pointer remain as is. This is perfectly
-			 * well.
-			 */
-			if(*p2parse == ':') {
-				bTAGCharDetected = 1;
-				/* We will move hostname to tag, so preserve ':' (otherwise we 
-				 * will needlessly change the message format) */
-				*pWork++ = *p2parse++; 
-			} else if(*p2parse == ' ')
-				++p2parse;
-			*pWork = '\0';
-			MsgAssignHOSTNAME(pMsg, pBuf);
-		}
-		/* check if we seem to have a TAG */
-		if(bTAGCharDetected) {
-			/* indeed, this smells like a TAG, so lets use it for this. We take
-			 * the HOSTNAME from the sender system instead.
-			 */
-			dbgprintf("HOSTNAME contains invalid characters, assuming it to be a TAG.\n");
-			moveHOSTNAMEtoTAG(pMsg);
-			MsgSetHOSTNAME(pMsg, getRcvFrom(pMsg));
-		}
-
-		/* now parse TAG - that should be present in message from all sources.
-		 * This code is somewhat not compliant with RFC 3164. As of 3164,
-		 * the TAG field is ended by any non-alphanumeric character. In
-		 * practice, however, the TAG often contains dashes and other things,
-		 * which would end the TAG. So it is not desirable. As such, we only
-		 * accept colon and SP to be terminators. Even there is a slight difference:
-		 * a colon is PART of the TAG, while a SP is NOT part of the tag
-		 * (it is CONTENT). Starting 2008-04-04, we have removed the 32 character
-		 * size limit (from RFC3164) on the tag. This had bad effects on existing
-		 * envrionments, as sysklogd didn't obey it either (probably another bug
-		 * in RFC3164...). We now receive the full size, but will modify the
-		 * outputs so that only 32 characters max are used by default.
-		 */
-		/* The following code in general is quick & dirty - I need to get
-		 * it going for a test, rgerhards 2004-11-16 */
-		/* lol.. we tried to solve it, just to remind ourselfs that 32 octets
-		 * is the max size ;) we need to shuffle the code again... Just for 
-		 * the records: the code is currently clean, but we could optimize it! */
-		if(!bTAGCharDetected) {
-			uchar *pszTAG;
-			if(rsCStrConstruct(&pStrB) != RS_RET_OK) 
-				return 1;
-			rsCStrSetAllocIncrement(pStrB, 33);
-			pWork = pBuf;
-			iCnt = 0;
-			while(*p2parse && *p2parse != ':' && *p2parse != ' ') {
-				rsCStrAppendChar(pStrB, *p2parse++);
-				++iCnt;
-			}
-			if(*p2parse == ':') {
-				++p2parse; 
-				rsCStrAppendChar(pStrB, ':');
-			}
-			rsCStrFinish(pStrB);
-
-			rsCStrConvSzStrAndDestruct(pStrB, &pszTAG, 1);
-			if(pszTAG == NULL)
-			{	/* rger, 2005-11-10: no TAG found - this implies that what
-				 * we have considered to be the HOSTNAME is most probably the
-				 * TAG. We consider it so probable, that we now adjust it
-				 * that way. So we pick up the previously set hostname, assign
-				 * it to tag and use the sender system (from IP stack) as
-				 * the hostname. This situation is the standard case with
-				 * stock BSD syslogd.
-				 */
-				dbgprintf("No TAG in message, assuming that HOSTNAME is missing.\n");
-				moveHOSTNAMEtoTAG(pMsg);
-				MsgSetHOSTNAME(pMsg, getRcvFrom(pMsg));
-			} else { /* we have a TAG, so we can happily set it ;) */
-				MsgAssignTAG(pMsg, pszTAG);
-			}
-		} else {
-			/* we have no TAG, so we ... */
-			/*DO NOTHING*/;
-		}
-	} else {
-		/* we enter this code area when the user has instructed rsyslog NOT
-		 * to parse HOSTNAME and TAG - rgerhards, 2006-03-13
-		 */
-		if(!(flags & INTERNAL_MSG))
-		{
-			dbgprintf("HOSTNAME and TAG not parsed by user configuraton.\n");
-			MsgSetHOSTNAME(pMsg, getRcvFrom(pMsg));
-		}
-	}
-
-	/* The rest is the actual MSG */
-	MsgSetMSG(pMsg, p2parse);
-
-	return 0; /* all ok */
-}
-
-
-/* submit a fully created message to the main message queue. The message is
- * fully processed and parsed, so no parsing at all happens. This is primarily
- * a hook to prevent the need for callers to know about the main message queue
- * (which may change in the future as we will probably have multiple rule
- * sets and thus queues...).
- * rgerhards, 2008-02-13
- */
-rsRetVal
-submitMsg(msg_t *pMsg)
-{
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pMsg, msg);
-	
-	MsgPrepareEnqueue(pMsg);
-	queueEnqObj(pMsgQueue, pMsg->flowCtlType, (void*) pMsg);
-
-	RETiRet;
-}
-
-
-/*
- * Log a message to the appropriate log files, users, etc. based on
- * the priority.
- * rgerhards 2004-11-08: actually, this also decodes all but the PRI part.
- * rgerhards 2004-11-09: ... but only, if syslogd could properly be initialized
- *			 if not, we use emergency logging to the console and in
- *                       this case, no further decoding happens.
- * changed to no longer receive a plain message but a msg object instead.
- * rgerhards-2004-11-16: OK, we are now up to another change... This method
- * actually needs to PARSE the message. How exactly this needs to happen depends on
- * a number of things. Most importantly, it depends on the source. For example,
- * locally received messages (SOURCE_UNIXAF) do NOT have a hostname in them. So
- * we need to treat them differntly form network-received messages which have.
- * Well, actually not all network-received message really have a hostname. We
- * can just hope they do, but we can not be sure. So this method tries to find
- * whatever can be found in the message and uses that... Obviously, there is some
- * potential for misinterpretation, which we simply can not solve under the
- * circumstances given.
- */
-void
-logmsg(msg_t *pMsg, int flags)
-{
-	char *msg;
-
-	BEGINfunc
-	assert(pMsg != NULL);
-	assert(pMsg->pszUxTradMsg != NULL);
-	msg = (char*) pMsg->pszUxTradMsg;
-	dbgprintf("logmsg: flags %x, from '%s', msg %s\n", flags, getRcvFrom(pMsg), msg);
-
-	/* rger 2005-11-24 (happy thanksgiving!): we now need to check if we have
-	 * a traditional syslog message or one formatted according to syslog-protocol.
-	 * We need to apply different parsers depending on that. We use the
-	 * -protocol VERSION field for the detection.
-	 */
-	if(msg[0] == '1' && msg[1] == ' ') {
-		dbgprintf("Message has syslog-protocol format.\n");
-		setProtocolVersion(pMsg, 1);
-		if(parseRFCSyslogMsg(pMsg, flags) == 1) {
-			msgDestruct(&pMsg);
-			return;
-		}
-	} else { /* we have legacy syslog */
-		dbgprintf("Message has legacy syslog format.\n");
-		setProtocolVersion(pMsg, 0);
-		if(parseLegacySyslogMsg(pMsg, flags) == 1) {
-			msgDestruct(&pMsg);
-			return;
-		}
-	}
-
-	/* ---------------------- END PARSING ---------------- */
-	
-	/* now submit the message to the main queue - then we are done */
-	pMsg->msgFlags = flags;
-	MsgPrepareEnqueue(pMsg);
-	queueEnqObj(pMsgQueue, pMsg->flowCtlType, (void*) pMsg);
-	ENDfunc
-}
-
-
-static void
-reapchild()
-{
-	int saved_errno = errno;
-	struct sigaction sigAct;
-
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-	sigAct.sa_handler = reapchild;
-	sigaction(SIGCHLD, &sigAct, NULL);  /* reset signal handler -ASP */
-
-	while(waitpid(-1, NULL, WNOHANG) > 0);
-	errno = saved_errno;
-}
-
-
-/* helper to doFlushRptdMsgs() to flush the individual action links via llExecFunc
- * rgerhards, 2007-08-02
- */
-DEFFUNC_llExecFunc(flushRptdMsgsActions)
-{
-	action_t *pAction = (action_t*) pData;
-
-	assert(pAction != NULL);
-	
-	BEGINfunc
-	LockObj(pAction);
-	if (pAction->f_prevcount && time(NULL) >= REPEATTIME(pAction)) {
-		dbgprintf("flush %s: repeated %d times, %d sec.\n",
-		    module.GetStateName(pAction->pMod), pAction->f_prevcount,
-		    repeatinterval[pAction->f_repeatcount]);
-		actionWriteToAction(pAction);
-		BACKOFF(pAction);
-	}
-	UnlockObj(pAction);
-
-	ENDfunc
-	return RS_RET_OK; /* we ignore errors, we can not do anything either way */
-}
-
-
-/* This method flushes reapeat messages.
- */
-static void
-doFlushRptdMsgs(void)
-{
-	register selector_t *f;
-
-	/* see if we need to flush any "message repeated n times"... 
-	 * Note that this interferes with objects running on other threads.
-	 * We are using appropriate locking inside the function to handle that.
-	 */
-	for (f = Files; f != NULL ; f = f->f_next) {
-		llExecFunc(&f->llActList, flushRptdMsgsActions, NULL);
-	}
-}
-
-
-static void debug_switch()
-{
-	struct sigaction sigAct;
-
-	if(debugging_on == 0) {
-		debugging_on = 1;
-		dbgprintf("Switching debugging_on to true\n");
-	} else {
-		dbgprintf("Switching debugging_on to false\n");
-		debugging_on = 0;
-	}
-	
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-	sigAct.sa_handler = debug_switch;
-	sigaction(SIGUSR1, &sigAct, NULL);
-}
-
-
-void legacyOptsEnq(uchar *line)
-{
-	legacyOptsLL_t *pNew;
-
-	pNew = malloc(sizeof(legacyOptsLL_t));
-	if(line == NULL)
-		pNew->line = NULL;
-	else
-		pNew->line = (uchar *) strdup((char *) line);
-	pNew->next = NULL;
-
-	if(pLegacyOptsLL == NULL)
-		pLegacyOptsLL = pNew;
-	else {
-		legacyOptsLL_t *pThis = pLegacyOptsLL;
-
-		while(pThis->next != NULL)
-			pThis = pThis->next;
-		pThis->next = pNew;
-	}
-}
-
-
-void legacyOptsFree(void)
-{
-	legacyOptsLL_t *pThis = pLegacyOptsLL, *pNext;
-
-	while(pThis != NULL) {
-		if(pThis->line != NULL)
-			free(pThis->line);
-		pNext = pThis->next;
-		free(pThis);
-		pThis = pNext;
-	}
-}
-
-
-void legacyOptsHook(void)
-{
-	legacyOptsLL_t *pThis = pLegacyOptsLL;
-
-	while(pThis != NULL) {
-		if(pThis->line != NULL) {
-			errno = 0;
-			errmsg.LogError(NO_ERRCODE, "Warning: backward compatibility layer added to following "
-				        "directive to rsyslog.conf: %s", pThis->line);
-			conf.cfsysline(pThis->line);
-		}
-		pThis = pThis->next;
-	}
-}
-
-
-void legacyOptsParseTCP(char ch, char *arg)
-{
-	register int i;
-	register char *pArg = arg;
-	static char conflict = '\0';
-
-	if((conflict == 'g' && ch == 't') || (conflict == 't' && ch == 'g')) {
-		fprintf(stderr, "rsyslog: If you want to use both -g and -t, use directives instead, -%c ignored.\n", ch);
-		return;
-	} else
-		conflict = ch;
-
-	/* extract port */
-	i = 0;
-	while(isdigit((int) *pArg))
-		i = i * 10 + *pArg++ - '0';
-
-	/* number of sessions */
-	if(*pArg == '\0' || *pArg == ',') {
-		if(ch == 't')
-			legacyOptsEnq((uchar *) "ModLoad imtcp");
-		else if(ch == 'g')
-			legacyOptsEnq((uchar *) "ModLoad imgssapi");
-
-		if(i >= 0 && i <= 65535) {
-			uchar line[30];
-
-			if(ch == 't') {
-				snprintf((char *) line, sizeof(line), "InputTCPServerRun %d", i);
-			} else if(ch == 'g') {
-				snprintf((char *) line, sizeof(line), "InputGSSServerRun %d", i);
-			}
-			legacyOptsEnq(line);
-		} else {
-			if(ch == 't') {
-				fprintf(stderr, "rsyslogd: Invalid TCP listen port %d - changed to 514.\n", i);
-				legacyOptsEnq((uchar *) "InputTCPServerRun 514");
-			} else if(ch == 'g') {
-				fprintf(stderr, "rsyslogd: Invalid GSS listen port %d - changed to 514.\n", i);
-				legacyOptsEnq((uchar *) "InputGSSServerRun 514");
-			}
-		}
-
-		if(*pArg == ',') {
-			++pArg;
-			while(isspace((int) *pArg))
-				++pArg;
-			i = 0;
-			while(isdigit((int) *pArg)) {
-				i = i * 10 + *pArg++ - '0';
-			}
-			if(i > 0) {
-				uchar line[30];
-
-				snprintf((char *) line, sizeof(line), "InputTCPMaxSessions %d", i);
-				legacyOptsEnq(line);
-			} else {
-				if(ch == 't') {
-					fprintf(stderr,	"rsyslogd: TCP session max configured "
-						"to %d [-t %s] - changing to 1.\n", i, arg);
-					legacyOptsEnq((uchar *) "InputTCPMaxSessions 1");
-				} else if (ch == 'g') {
-					fprintf(stderr,	"rsyslogd: GSS session max configured "
-						"to %d [-g %s] - changing to 1.\n", i, arg);
-					legacyOptsEnq((uchar *) "InputTCPMaxSessions 1");
-				}
-			}
-		}
-	} else
-		fprintf(stderr, "rsyslogd: Invalid -t %s command line option.\n", arg);
-}
-
-
-/* doDie() is a signal handler. If called, it sets the bFinished variable
- * to indicate the program should terminate. However, it does not terminate
- * it itself, because that causes issues with multi-threading. The actual
- * termination is then done on the main thread. This solution might introduce
- * a minimal delay, but it is much cleaner than the approach of doing everything
- * inside the signal handler.
- * rgerhards, 2005-10-26
- */
-static void doDie(int sig)
-{
-	static int iRetries = 0; /* debug aid */
-	printf("DoDie called.\n");
-	if(iRetries++ == 4) {
-		printf("DoDie called 5 times - unconditional exit\n");
-		abort();
-	}
-	bFinished = sig;
-}
-
-
-/* This function frees all dynamically allocated memory for program termination.
- * It must be called only immediately before exit(). It is primarily an aid
- * for memory debuggers, which prevents cluttered outupt.
- * rgerhards, 2008-03-20
- */
-static void
-freeAllDynMemForTermination(void)
-{
-	if(pszWorkDir != NULL)
-		free(pszWorkDir);
-	if(pszMainMsgQFName != NULL)
-		free(pszMainMsgQFName);
-	if(pModDir != NULL)
-		free(pModDir);
-	if(LocalHostName != NULL)
-		free(LocalHostName);
-}
-
-
-/* die() is called when the program shall end. This typically only occurs
- * during sigterm or during the initialization. 
- * As die() is intended to shutdown rsyslogd, it is
- * safe to call exit() here. Just make sure that die() itself is not called
- * at inapropriate places. As a general rule of thumb, it is a bad idea to add
- * any calls to die() in new code!
- * rgerhards, 2005-10-24
- */
-static void
-die(int sig)
-{
-	char buf[256];
-
-	dbgprintf("exiting on signal %d\n", sig);
-
-	/* IMPORTANT: we should close the inputs first, and THEN send our termination
-	 * message. If we do it the other way around, logmsgInternal() may block on
-	 * a full queue and the inputs still fill up that queue. Depending on the
-	 * scheduling order, we may end up with logmsgInternal being held for a quite
-	 * long time. When the inputs are terminated first, that should not happen
-	 * because the queue is drained in parallel. The situation could only become
-	 * an issue with extremely long running actions in a queue full environment.
-	 * However, such actions are at least considered poorly written, if not
-	 * outright wrong. So we do not care about this very remote problem.
-	 * rgerhards, 2008-01-11
-	 */
-
-	/* close the inputs */
-	dbgprintf("Terminating input threads...\n");
-	thrdTerminateAll(); /* TODO: inputs only, please */
-
-	/* and THEN send the termination log message (see long comment above) */
-	if (sig) {
-		(void) snprintf(buf, sizeof(buf) / sizeof(char),
-		 " [origin software=\"rsyslogd\" " "swVersion=\"" VERSION \
-		 "\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"]" " exiting on signal %d.",
-		 (int) myPid, sig);
-		errno = 0;
-		logmsgInternal(LOG_SYSLOG|LOG_INFO, buf, ADDDATE);
-	}
-	
-	/* drain queue (if configured so) and stop main queue worker thread pool */
-	dbgprintf("Terminating main queue...\n");
-	queueDestruct(&pMsgQueue);
-	pMsgQueue = NULL;
-
-	/* Free ressources and close connections. This includes flushing any remaining
-	 * repeated msgs.
-	 */
-	dbgprintf("Terminating outputs...\n");
-	freeSelectors();
-
-	dbgprintf("all primary multi-thread sources have been terminated - now doing aux cleanup...\n");
-	/* rger 2005-02-22
-	 * now clean up the in-memory structures. OK, the OS
-	 * would also take care of that, but if we do it
-	 * ourselfs, this makes finding memory leaks a lot
-	 * easier.
-	 */
-	tplDeleteAll();
-
-	remove_pid(PidFile);
-	if(glblHadMemShortage)
-		dbgprintf("Had memory shortage at least once during the run.\n");
-
-	/* de-init some modules */
-	modExitIminternal();
-
-	/*dbgPrintAllDebugInfo(); / * this is the last spot where this can be done - below output modules are unloaded! */
-
-	/* the following line cleans up CfSysLineHandlers that were not based on loadable
-	 * modules. As such, they are not yet cleared.
-	 */
-	unregCfSysLineHdlrs();
-
-	legacyOptsFree();
-
-	/* terminate the remaining classes */
-	GlobalClassExit();
-
-	/* TODO: this would also be the right place to de-init the builtin output modules. We
-	 * do not currently do that, because the module interface does not allow for
-	 * it. This will come some time later (it's essential with loadable modules).
-	 * For the time being, this is a memory leak on exit, but as the process is
-	 * terminated, we do not really bother about it.
-	 * rgerhards, 2007-08-03
-	 * I have added some code now, but all that mod init/de-init should be moved to
-	 * init, so that modules are unloaded and reloaded on HUP to. Eventually it should go
-	 * into freeSelectors() - but that needs to be seen. -- rgerhards, 2007-08-09
-	 */
-	module.UnloadAndDestructAll(eMOD_LINK_ALL);
-
-	dbgprintf("Clean shutdown completed, bye\n");
-	/* dbgClassExit MUST be the last one, because it de-inits the debug system */
-	dbgClassExit();
-
-	/* free all remaining memory blocks - this is not absolutely necessary, but helps
-	 * us keep memory debugger logs clean and this is in aid in developing. It doesn't
-	 * cost much time, so we do it always. -- rgerhards, 2008-03-20
-	 */
-	freeAllDynMemForTermination();
-	/* NO CODE HERE - feeelAllDynMemForTermination() must be the last thing before exit()! */
-	exit(0); /* "good" exit, this is the terminator function for rsyslog [die()] */
-}
-
-/*
- * Signal handler to terminate the parent process.
- * rgerhards, 2005-10-24: this is only called during forking of the
- * detached syslogd. I consider this method to be safe.
- */
-static void doexit()
-{
-	exit(0); /* "good" exit, only during child-creation */
-}
-
-
-/* set the action resume interval
- */
-static rsRetVal setActionResumeInterval(void __attribute__((unused)) *pVal, int iNewVal)
-{
-	return actionSetGlobalResumeInterval(iNewVal);
-}
-
-
-/* set the processes umask (upon configuration request)
- */
-static rsRetVal setUmask(void __attribute__((unused)) *pVal, int iUmask)
-{
-	umask(iUmask);
-	dbgprintf("umask set to 0%3.3o.\n", iUmask);
-
-	return RS_RET_OK;
-}
-
-
-/* helper to freeSelectors(), used with llExecFunc() to flush 
- * pending output.  -- rgerhards, 2007-08-02
- * We do not need to lock the action object here as the processing
- * queue is already empty and no other threads are running when
- * we call this function. -- rgerhards, 2007-12-12
- */
-DEFFUNC_llExecFunc(freeSelectorsActions)
-{
-	action_t *pAction = (action_t*) pData;
-
-	assert(pAction != NULL);
-
-	/* flush any pending output */
-	if(pAction->f_prevcount) {
-		actionWriteToAction(pAction);
-	}
-
-	return RS_RET_OK; /* never fails ;) */
-}
-
-
-/*  Close all open log files and free selector descriptor array.
- */
-static void freeSelectors(void)
-{
-	selector_t *f;
-	selector_t *fPrev;
-
-	if(Files != NULL) {
-		dbgprintf("Freeing log structures.\n");
-
-		for(f = Files ; f != NULL ; f = f->f_next) {
-			llExecFunc(&f->llActList, freeSelectorsActions, NULL);
-		}
-
-		/* actions flushed and ready for destruction - so do that... */
-		f = Files;
-		while (f != NULL) {
-			fPrev = f;
-			f = f->f_next;
-			selectorDestruct(fPrev);
-		}
-
-		/* Reflect the deletion of the selectors linked list. */
-		Files = NULL;
-		bHaveMainQueue = 0;
-	}
-}
-
-
-/* helper to dbPrintInitInfo, to print out all actions via
- * the llExecFunc() facility.
- * rgerhards, 2007-08-02
- */
-DEFFUNC_llExecFunc(dbgPrintInitInfoAction)
-{
-	DEFiRet;
-	iRet = actionDbgPrint((action_t*) pData);
-	dbgprintf("\n");
-
-	RETiRet;
-}
-
-/* print debug information as part of init(). This pretty much
- * outputs the whole config of rsyslogd. I've moved this code
- * out of init() to clean it somewhat up.
- * rgerhards, 2007-07-31
- */
-static void dbgPrintInitInfo(void)
-{
-	register selector_t *f;
-	int iSelNbr = 1;
-	int i;
-
-	dbgprintf("\nActive selectors:\n");
-	for (f = Files; f != NULL ; f = f->f_next) {
-		dbgprintf("Selector %d:\n", iSelNbr++);
-		if(f->pCSProgNameComp != NULL)
-			dbgprintf("tag: '%s'\n", rsCStrGetSzStrNoNULL(f->pCSProgNameComp));
-		if(f->eHostnameCmpMode != HN_NO_COMP)
-			dbgprintf("hostname: %s '%s'\n",
-				f->eHostnameCmpMode == HN_COMP_MATCH ?
-					"only" : "allbut",
-				rsCStrGetSzStrNoNULL(f->pCSHostnameComp));
-		if(f->f_filter_type == FILTER_PRI) {
-			for (i = 0; i <= LOG_NFACILITIES; i++)
-				if (f->f_filterData.f_pmask[i] == TABLE_NOPRI)
-					dbgprintf(" X ");
-				else
-					dbgprintf("%2X ", f->f_filterData.f_pmask[i]);
-		} else if(f->f_filter_type == FILTER_EXPR) {
-			dbgprintf("EXPRESSION-BASED Filter: can currently not be displayed");
-		} else {
-			dbgprintf("PROPERTY-BASED Filter:\n");
-			dbgprintf("\tProperty.: '%s'\n",
-			       rsCStrGetSzStrNoNULL(f->f_filterData.prop.pCSPropName));
-			dbgprintf("\tOperation: ");
-			if(f->f_filterData.prop.isNegated)
-				dbgprintf("NOT ");
-			dbgprintf("'%s'\n", getFIOPName(f->f_filterData.prop.operation));
-			dbgprintf("\tValue....: '%s'\n",
-			       rsCStrGetSzStrNoNULL(f->f_filterData.prop.pCSCompValue));
-			dbgprintf("\tAction...: ");
-		}
-
-		dbgprintf("\nActions:\n");
-		llExecFunc(&f->llActList, dbgPrintInitInfoAction, NULL); /* actions */
-
-		dbgprintf("\n");
-	}
-	dbgprintf("\n");
-	if(bDebugPrintTemplateList)
-		tplPrintList();
-	if(bDebugPrintModuleList)
-		module.PrintList();
-	ochPrintList();
-
-	if(bDebugPrintCfSysLineHandlerList)
-		dbgPrintCfSysLineHandlers();
-
-	dbgprintf("Messages with malicious PTR DNS Records are %sdropped.\n",
-		bDropMalPTRMsgs	? "" : "not ");
-
-	dbgprintf("Control characters are %sreplaced upon reception.\n",
-			bEscapeCCOnRcv? "" : "not ");
-
-	if(bEscapeCCOnRcv)
-		dbgprintf("Control character escape sequence prefix is '%c'.\n",
-			cCCEscapeChar);
-
-	dbgprintf("Main queue size %d messages.\n", iMainMsgQueueSize);
-	dbgprintf("Main queue worker threads: %d, Perists every %d updates.\n",
-		  iMainMsgQueueNumWorkers, iMainMsgQPersistUpdCnt);
-	dbgprintf("Main queue timeouts: shutdown: %d, action completion shutdown: %d, enq: %d\n",
-		   iMainMsgQtoQShutdown, iMainMsgQtoActShutdown, iMainMsgQtoEnq);
-	dbgprintf("Main queue watermarks: high: %d, low: %d, discard: %d, discard-severity: %d\n",
-		   iMainMsgQHighWtrMark, iMainMsgQLowWtrMark, iMainMsgQDiscardMark, iMainMsgQDiscardSeverity);
-	dbgprintf("Main queue save on shutdown %d, max disk space allowed %lld\n",
-		   bMainMsgQSaveOnShutdown, iMainMsgQueMaxDiskSpace);
-	/* TODO: add
-	iActionRetryCount = 0;
-	iActionRetryInterval = 30000;
-	static int iMainMsgQtoWrkShutdown = 60000;
-	static int iMainMsgQtoWrkMinMsgs = 100;	
-	static int iMainMsgQbSaveOnShutdown = 1;
-	iMainMsgQueMaxDiskSpace = 0;
-	setQPROP(queueSettoWrkShutdown, "$MainMsgQueueTimeoutWorkerThreadShutdown", 5000);
-	setQPROP(queueSetiMinMsgsPerWrkr, "$MainMsgQueueWorkerThreadMinimumMessages", 100);
-	setQPROP(queueSetbSaveOnShutdown, "$MainMsgQueueSaveOnShutdown", 1);
-	 */
-	dbgprintf("Work Directory: '%s'.\n", pszWorkDir);
-}
-
-
-/* Start the input modules. This function will probably undergo big changes
- * while we implement the input module interface. For now, it does the most
- * important thing to get at least my poor initial input modules up and
- * running. Almost no config option is taken.
- * rgerhards, 2007-12-14
- */
-static rsRetVal
-startInputModules(void)
-{
-	DEFiRet;
-	modInfo_t *pMod;
-
-	/* loop through all modules and activate them (brr...) */
-	pMod = module.GetNxtType(NULL, eMOD_IN);
-	while(pMod != NULL) {
-		if((iRet = pMod->mod.im.willRun()) == RS_RET_OK) {
-			/* activate here */
-			thrdCreate(pMod->mod.im.runInput, pMod->mod.im.afterRun);
-		} else {
-			dbgprintf("module %lx will not run, iRet %d\n", (unsigned long) pMod, iRet);
-		}
-	pMod = module.GetNxtType(pMod, eMOD_IN);
-	}
-
-	ENDfunc
-	return RS_RET_OK; /* intentional: we do not care about module errors */
-}
-
-
-/* INIT -- Initialize syslogd from configuration table
- * init() is called at initial startup AND each time syslogd is HUPed
- */
-static void
-init(void)
-{
-	DEFiRet;
-	char cbuf[BUFSIZ];
-	char bufStartUpMsg[512];
-	struct sigaction sigAct;
-
-	thrdTerminateAll(); /* stop all running input threads - TODO: reconsider location! */
-
-	/* initialize some static variables */
-	pDfltHostnameCmp = NULL;
-	pDfltProgNameCmp = NULL;
-	eDfltHostnameCmpMode = HN_NO_COMP;
-
-	dbgprintf("rsyslog %s - called init()\n", VERSION);
-
-	/* delete the message queue, which also flushes all messages left over */
-	if(pMsgQueue != NULL) {
-		dbgprintf("deleting main message queue\n");
-		queueDestruct(&pMsgQueue); /* delete pThis here! */
-		pMsgQueue = NULL;
-	}
-
-	/*  Close all open log files and free log descriptor array. This also frees
-	 *  all output-modules instance data.
-	 */
-	freeSelectors();
-
-	/* Unload all non-static modules */
-	dbgprintf("Unloading non-static modules.\n");
-	module.UnloadAndDestructAll(eMOD_LINK_DYNAMIC_LOADED);
-
-	dbgprintf("Clearing templates.\n");
-	tplDeleteNew();
-
-	/* re-setting values to defaults (where applicable) */
-	/* TODO: once we have loadable modules, we must re-visit this code. The reason is
-	 * that config variables are not re-set, because the module is not yet loaded. On
-	 * the other hand, that doesn't matter, because the module got unloaded and is then
-	 * re-loaded, so the variables should be re-set via that way. In any case, we should
-	 * think about the whole situation when we implement loadable plugins.
-	 * rgerhards, 2007-07-31
-	 */
-	conf.cfsysline((uchar*)"ResetConfigVariables");
-
-	/* open the configuration file */
-	if((iRet = conf.processConfFile(ConfFile)) != RS_RET_OK) {
-		/* rgerhards: this code is executed to set defaults when the
-		 * config file could not be opened. We might think about
-		 * abandoning the run in this case - but this, too, is not
-		 * very clever... So we stick with what we have.
-		 * We ignore any errors while doing this - we would be lost anyhow...
-		 */
-		selector_t *f = NULL;
-		char szTTYNameBuf[_POSIX_TTY_NAME_MAX+1]; /* +1 for NULL character */
-		dbgprintf("primary config file could not be opened - using emergency definitions.\n");
-		conf.cfline((uchar*)"*.ERR\t" _PATH_CONSOLE, &f);
-		conf.cfline((uchar*)"*.PANIC\t*", &f);
-		if(ttyname_r(0, szTTYNameBuf, sizeof(szTTYNameBuf)) == 0) {
-			snprintf(cbuf,sizeof(cbuf), "*.*\t%s", szTTYNameBuf);
-			conf.cfline((uchar*)cbuf, &f);
-		}
-		selectorAddList(f);
-	}
-
-	legacyOptsHook();
-
-	/* we are now done with reading the configuration. This is the right time to
-	 * free some objects that were just needed for loading it. rgerhards 2005-10-19
-	 */
-	if(pDfltHostnameCmp != NULL) {
-		rsCStrDestruct(&pDfltHostnameCmp);
-	}
-
-	if(pDfltProgNameCmp != NULL) {
-		rsCStrDestruct(&pDfltProgNameCmp);
-	}
-
-	/* some checks */
-	if(iMainMsgQueueNumWorkers < 1) {
-		errmsg.LogError(NO_ERRCODE, "$MainMsgQueueNumWorkers must be at least 1! Set to 1.\n");
-		iMainMsgQueueNumWorkers = 1;
-	}
-
-	if(MainMsgQueType == QUEUETYPE_DISK) {
-		errno = 0;	/* for logerror! */
-		if(pszWorkDir == NULL) {
-			errmsg.LogError(NO_ERRCODE, "No $WorkDirectory specified - can not run main message queue in 'disk' mode. "
-				 "Using 'FixedArray' instead.\n");
-			MainMsgQueType = QUEUETYPE_FIXED_ARRAY;
-		}
-		if(pszMainMsgQFName == NULL) {
-			errmsg.LogError(NO_ERRCODE, "No $MainMsgQueueFileName specified - can not run main message queue in "
-				 "'disk' mode. Using 'FixedArray' instead.\n");
-			MainMsgQueType = QUEUETYPE_FIXED_ARRAY;
-		}
-	}
-
-	/* switch the message object to threaded operation, if necessary */
-	if(MainMsgQueType == QUEUETYPE_DIRECT || iMainMsgQueueNumWorkers > 1) {
-		MsgEnableThreadSafety();
-	}
-
-	/* create message queue */
-	CHKiRet_Hdlr(queueConstruct(&pMsgQueue, MainMsgQueType, iMainMsgQueueNumWorkers, iMainMsgQueueSize, msgConsumer)) {
-		/* no queue is fatal, we need to give up in that case... */
-		fprintf(stderr, "fatal error %d: could not create message queue - rsyslogd can not run!\n", iRet);
-		exit(1);
-	}
-	/* name our main queue object (it's not fatal if it fails...) */
-	obj.SetName((obj_t*) pMsgQueue, (uchar*) "main queue");
-
-	/* ... set some properties ... */
-#	define setQPROP(func, directive, data) \
-	CHKiRet_Hdlr(func(pMsgQueue, data)) { \
-		errmsg.LogError(NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
-	}
-#	define setQPROPstr(func, directive, data) \
-	CHKiRet_Hdlr(func(pMsgQueue, data, (data == NULL)? 0 : strlen((char*) data))) { \
-		errmsg.LogError(NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
-	}
-
-	setQPROP(queueSetMaxFileSize, "$MainMsgQueueFileSize", iMainMsgQueMaxFileSize);
-	setQPROP(queueSetsizeOnDiskMax, "$MainMsgQueueMaxDiskSpace", iMainMsgQueMaxDiskSpace);
-	setQPROPstr(queueSetFilePrefix, "$MainMsgQueueFileName", pszMainMsgQFName);
-	setQPROP(queueSetiPersistUpdCnt, "$MainMsgQueueCheckpointInterval", iMainMsgQPersistUpdCnt);
-	setQPROP(queueSettoQShutdown, "$MainMsgQueueTimeoutShutdown", iMainMsgQtoQShutdown );
-	setQPROP(queueSettoActShutdown, "$MainMsgQueueTimeoutActionCompletion", iMainMsgQtoActShutdown);
-	setQPROP(queueSettoWrkShutdown, "$MainMsgQueueWorkerTimeoutThreadShutdown", iMainMsgQtoWrkShutdown);
-	setQPROP(queueSettoEnq, "$MainMsgQueueTimeoutEnqueue", iMainMsgQtoEnq);
-	setQPROP(queueSetiHighWtrMrk, "$MainMsgQueueHighWaterMark", iMainMsgQHighWtrMark);
-	setQPROP(queueSetiLowWtrMrk, "$MainMsgQueueLowWaterMark", iMainMsgQLowWtrMark);
-	setQPROP(queueSetiDiscardMrk, "$MainMsgQueueDiscardMark", iMainMsgQDiscardMark);
-	setQPROP(queueSetiDiscardSeverity, "$MainMsgQueueDiscardSeverity", iMainMsgQDiscardSeverity);
-	setQPROP(queueSetiMinMsgsPerWrkr, "$MainMsgQueueWorkerThreadMinimumMessages", iMainMsgQWrkMinMsgs);
-	setQPROP(queueSetbSaveOnShutdown, "$MainMsgQueueSaveOnShutdown", bMainMsgQSaveOnShutdown);
-	setQPROP(queueSetiDeqSlowdown, "$MainMsgQueueDequeueSlowdown", iMainMsgQDeqSlowdown);
-	setQPROP(queueSetiDeqtWinFromHr,  "$MainMsgQueueDequeueTimeBegin", iMainMsgQueueDeqtWinFromHr);
-	setQPROP(queueSetiDeqtWinToHr,    "$MainMsgQueueDequeueTimeEnd", iMainMsgQueueDeqtWinToHr);
-
-#	undef setQPROP
-#	undef setQPROPstr
-
-	/* ... and finally start the queue! */
-	CHKiRet_Hdlr(queueStart(pMsgQueue)) {
-		/* no queue is fatal, we need to give up in that case... */
-		fprintf(stderr, "fatal error %d: could not start message queue - rsyslogd can not run!\n", iRet);
-		exit(1);
-	}
-
-	bHaveMainQueue = (MainMsgQueType == QUEUETYPE_DIRECT) ? 0 : 1;
-	dbgprintf("Main processing queue is initialized and running\n");
-
-	/* the output part and the queue is now ready to run. So it is a good time
-	 * to start the inputs. Please note that the net code above should be
-	 * shuffled to down here once we have everything in input modules.
-	 * rgerhards, 2007-12-14
-	 */
-	startInputModules();
-
-	if(Debug) {
-		dbgPrintInitInfo();
-	}
-
-	/* we now generate the startup message. It now includes everything to
-	 * identify this instance. -- rgerhards, 2005-08-17
-	 */
-	snprintf(bufStartUpMsg, sizeof(bufStartUpMsg)/sizeof(char), 
-		 " [origin software=\"rsyslogd\" " "swVersion=\"" VERSION \
-		 "\" x-pid=\"%d\" x-info=\"http://www.rsyslog.com\"] restart",
-		 (int) myPid);
-	logmsgInternal(LOG_SYSLOG|LOG_INFO, bufStartUpMsg, ADDDATE);
-
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-	sigAct.sa_handler = sighup_handler;
-	sigaction(SIGHUP, &sigAct, NULL);
-
-	dbgprintf(" (re)started.\n");
-	ENDfunc
-}
-
-
-/* add a completely-processed selector (after config line parsing) to
- * the linked list of selectors. We now need to check
- * if it has any actions associated and, if so, link it to the linked
- * list. If it has nothing associated with it, we can simply discard
- * it.
- * We have one special case during initialization: then, the current
- * selector is NULL, which means we do not need to care about it at
- * all.  -- rgerhards, 2007-08-01
- */
-rsRetVal
-selectorAddList(selector_t *f)
-{
-	DEFiRet;
-	int iActionCnt;
-
-	static selector_t *nextp = NULL; /* TODO: make this go away (see comment below) */
-
-	if(f != NULL) {
-		CHKiRet(llGetNumElts(&f->llActList, &iActionCnt));
-		if(iActionCnt == 0) {
-			errmsg.LogError(NO_ERRCODE, "warning: selector line without actions will be discarded");
-			selectorDestruct(f);
-		} else {
-			/* successfully created an entry */
-			dbgprintf("selector line successfully processed\n");
-			/* TODO: we should use the linked list class for the selector list, else we need to add globals
-			 * ... well nextp could be added temporarily...
-			 * Thanks to varmojfekoj for having the idea to just use "Files" to make this
-			 * code work. I had actually forgotten to fix the code here before moving to 1.18.0.
-			 * And, of course, I also did not migrate the selector_t structure to the linked list class.
-			 * However, that should still be one of the very next things to happen.
-			 * rgerhards, 2007-08-06
-			 */
-			if(Files == NULL) {
-				Files = f;
-			} else {
-				nextp->f_next = f;
-			}
-			nextp = f;
-		}
-	}
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* set the main message queue mode
- * rgerhards, 2008-01-03
- */
-static rsRetVal setMainMsgQueType(void __attribute__((unused)) *pVal, uchar *pszType)
-{
-	DEFiRet;
-
-	if (!strcasecmp((char *) pszType, "fixedarray")) {
-		MainMsgQueType = QUEUETYPE_FIXED_ARRAY;
-		dbgprintf("main message queue type set to FIXED_ARRAY\n");
-	} else if (!strcasecmp((char *) pszType, "linkedlist")) {
-		MainMsgQueType = QUEUETYPE_LINKEDLIST;
-		dbgprintf("main message queue type set to LINKEDLIST\n");
-	} else if (!strcasecmp((char *) pszType, "disk")) {
-		MainMsgQueType = QUEUETYPE_DISK;
-		dbgprintf("main message queue type set to DISK\n");
-	} else if (!strcasecmp((char *) pszType, "direct")) {
-		MainMsgQueType = QUEUETYPE_DIRECT;
-		dbgprintf("main message queue type set to DIRECT (no queueing at all)\n");
-	} else {
-		errmsg.LogError(NO_ERRCODE, "unknown mainmessagequeuetype parameter: %s", (char *) pszType);
-		iRet = RS_RET_INVALID_PARAMS;
-	}
-	free(pszType); /* no longer needed */
-
-	RETiRet;
-}
-
-
-/*
- * The following function is resposible for handling a SIGHUP signal.  Since
- * we are now doing mallocs/free as part of init we had better not being
- * doing this during a signal handler.  Instead this function simply sets
- * a flag variable which will tell the main loop to go through a restart.
- */
-void sighup_handler()
-{
-	struct sigaction sigAct;
-	
-	restart = 1;
-
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-	sigAct.sa_handler = sighup_handler;
-	sigaction(SIGHUP, &sigAct, NULL);
-
-	return;
-}
-
-
-/**
- * getSubString
- *
- * Copy a string byte by byte until the occurrence  
- * of a given separator.
- *
- * \param ppSrc		Pointer to a pointer of the source array of characters. If a
-			separator detected the Pointer points to the next char after the
-			separator. Except if the end of the string is dedected ('\n'). 
-			Then it points to the terminator char. 
- * \param pDst		Pointer to the destination array of characters. Here the substing
-			will be stored.
- * \param DstSize	Maximum numbers of characters to store.
- * \param cSep		Separator char.
- * \ret int		Returns 0 if no error occured.
- *
- * rgerhards, 2008-02-12: some notes are due... I will once again fix this function, this time
- * so that it treats ' ' as a request for whitespace. But in general, the function and its callers
- * should be changed over time, this is not really very good code...
- */
-int getSubString(uchar **ppSrc,  char *pDst, size_t DstSize, char cSep)
-{
-	uchar *pSrc = *ppSrc;
-	int iErr = 0; /* 0 = no error, >0 = error */
-	while((cSep == ' ' ? !isspace(*pSrc) : *pSrc != cSep) && *pSrc != '\n' && *pSrc != '\0' && DstSize>1) {
-		*pDst++ = *(pSrc)++;
-		DstSize--;
-	}
-	/* check if the Dst buffer was to small */
-	if ((cSep == ' ' ? !isspace(*pSrc) : *pSrc != cSep) && *pSrc != '\n' && *pSrc != '\0') { 
-		dbgprintf("in getSubString, error Src buffer > Dst buffer\n");
-		iErr = 1;
-	}	
-	if (*pSrc == '\0' || *pSrc == '\n')
-		/* this line was missing, causing ppSrc to be invalid when it
-		 * was returned in case of end-of-string. rgerhards 2005-07-29
-		 */
-		*ppSrc = pSrc;
-	else
-		*ppSrc = pSrc+1;
-	*pDst = '\0';
-	return iErr;
-}
-
-
-/* this function pulls all internal messages from the buffer
- * and puts them into the processing engine.
- * We can only do limited error handling, as this would not
- * really help us. TODO: add error messages?
- * rgerhards, 2007-08-03
- */
-static void processImInternal(void)
-{
-	int iPri;
-	int iFlags;
-	msg_t *pMsg;
-
-	while(iminternalRemoveMsg(&iPri, &pMsg, &iFlags) == RS_RET_OK) {
-		logmsg(pMsg, iFlags);
-	}
-}
-
-
-/* This is the main processing loop. It is called after successful initialization.
- * When it returns, the syslogd terminates.
- * Its sole function is to provide some housekeeping things. The real work is done
- * by the other threads spawned.
- */
-static void
-mainloop(void)
-{
-	struct timeval tvSelectTimeout;
-
-	BEGINfunc
-	while(!bFinished){
-		/* first check if we have any internal messages queued and spit them out */
-		/* TODO: do we need this any longer? I doubt it, but let's care about it
- 		 * later -- rgerhards, 2007-12-21
- 		 */
-		processImInternal();
-
-		/* this is now just a wait */
-		tvSelectTimeout.tv_sec = TIMERINTVL;
-		tvSelectTimeout.tv_usec = 0;
-		select(1, NULL, NULL, NULL, &tvSelectTimeout);
-		if(bFinished)
-			break;	/* exit as quickly as possible - see long comment below */
-
-		/* If we received a HUP signal, we call doFlushRptdMsgs() a bit early. This
- 		 * doesn't matter, because doFlushRptdMsgs() checks timestamps. What may happen,
- 		 * however, is that the too-early call may lead to a bit too-late output
- 		 * of "last message repeated n times" messages. But that is quite acceptable.
- 		 * rgerhards, 2007-12-21
-		 * ... and just to explain, we flush here because that is exactly what the mainloop
-		 * shall do - provide a periodic interval in which not-yet-flushed messages will
-		 * be flushed. Be careful, there is a potential race condition: doFlushRptdMsgs()
-		 * needs to aquire a lock on the action objects. If, however, long-running consumers
-		 * cause the main queue worker threads to lock them for a long time, we may receive
-		 * a starvation condition, resulting in the mainloop being held on lock for an extended
-		 * period of time. That, in turn, could lead to unresponsiveness to termination
-		 * requests. It is especially important that the bFinished flag is checked before
-		 * doFlushRptdMsgs() is called (I know because I ran into that situation). I am
-		 * not yet sure if the remaining probability window of a termination-related
-		 * problem is large enough to justify changing the code - I would consider it
-		 * extremely unlikely that the problem ever occurs in practice. Fixing it would
-		 * require not only a lot of effort but would cost considerable performance. So
-		 * for the time being, I think the remaining risk can be accepted.
-		 * rgerhards, 2008-01-10
- 		 */
-		doFlushRptdMsgs();
-
-		if(restart) {
-			dbgprintf("\nReceived SIGHUP, reloading rsyslogd.\n");
-			/* main queue is stopped as part of init() */
-			init();
-			restart = 0;
-			continue;
-		}
-	}
-	ENDfunc
-}
-
-/* If user is not root, prints warnings or even exits 
- * TODO: check all dynafiles for write permission
- * ... but it is probably better to wait here until we have
- * a module interface - rgerhards, 2007-07-23
- */
-static void checkPermissions()
-{
-#if 0
-	/* TODO: this function must either be redone or removed - now with the input modules,
-	 * there is no such simple check we can do. What we can check, however, is if there is
-	 * any input module active and terminate, if not. -- rgerhards, 2007-12-26
-	 */
-	/* we are not root */
-	if (geteuid() != 0)
-	{
-		fputs("WARNING: Local messages will not be logged! If you want to log them, run rsyslog as root.\n",stderr); 
-#ifdef SYSLOG_INET	
-		/* udp enabled and port number less than or equal to 1024 */
-		if ( AcceptRemote && (atoi(LogPort) <= 1024) )
-			fprintf(stderr, "WARNING: Will not listen on UDP port %s. Use port number higher than 1024 or run rsyslog as root!\n", LogPort);
-		
-		/* tcp enabled and port number less or equal to 1024 */
-		if( bEnableTCP   && (atoi(TCPLstnPort) <= 1024) )
-			fprintf(stderr, "WARNING: Will not listen on TCP port %s. Use port number higher than 1024 or run rsyslog as root!\n", TCPLstnPort);
-
-		/* Neither explicit high UDP port nor explicit high TCP port.
-                 * It is useless to run anymore */
-		if( !(AcceptRemote && (atoi(LogPort) > 1024)) && !( bEnableTCP && (atoi(TCPLstnPort) > 1024)) )
-		{
-#endif
-			fprintf(stderr, "ERROR: Nothing to log, no reason to run. Please run rsyslog as root.\n");
-			exit(EXIT_FAILURE);
-#ifdef SYSLOG_INET
-		}
-#endif
-	}
-#endif
-}
-
-
-/* load build-in modules
- * very first version begun on 2007-07-23 by rgerhards
- */
-static rsRetVal loadBuildInModules(void)
-{
-	DEFiRet;
-
-	if((iRet = module.doModInit(modInitFile, (uchar*) "builtin-file", NULL)) != RS_RET_OK) {
-		RETiRet;
-	}
-#ifdef SYSLOG_INET
-	if((iRet = module.doModInit(modInitFwd, (uchar*) "builtin-fwd", NULL)) != RS_RET_OK) {
-		RETiRet;
-	}
-#endif
-	if((iRet = module.doModInit(modInitShell, (uchar*) "builtin-shell", NULL)) != RS_RET_OK) {
-		RETiRet;
-	}
-	if((iRet = module.doModInit(modInitDiscard, (uchar*) "builtin-discard", NULL)) != RS_RET_OK) {
-		RETiRet;
-	}
-
-	/* dirty, but this must be for the time being: the usrmsg module must always be
-	 * loaded as last module. This is because it processes any time of action selector.
-	 * If we load it before other modules, these others will never have a chance of
-	 * working with the config file. We may change that implementation so that a user name
-	 * must start with an alnum, that would definitely help (but would it break backwards
-	 * compatibility?). * rgerhards, 2007-07-23
-	 * User names now must begin with:
-	 *   [a-zA-Z0-9_.]
-	 */
-	if((iRet = module.doModInit(modInitUsrMsg, (uchar*) "builtin-usrmsg", NULL)) != RS_RET_OK)
-		RETiRet;
-
-	/* ok, initialization of the command handler probably does not 100% belong right in
-	 * this space here. However, with the current design, this is actually quite a good
-	 * place to put it. We might decide to shuffle it around later, but for the time
-	 * being, the code has found its home here. A not-just-sideeffect of this decision
-	 * is that rsyslog will terminate if we can not register our built-in config commands.
-	 * This, I think, is the right thing to do. -- rgerhards, 2007-07-31
-	 */
-	CHKiRet(regCfSysLineHdlr((uchar *)"workdirectory", 0, eCmdHdlrGetWord, NULL, &pszWorkDir, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"actionresumeretrycount", 0, eCmdHdlrInt, NULL, &glbliActionResumeRetryCount, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuefilename", 0, eCmdHdlrGetWord, NULL, &pszMainMsgQFName, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuesize", 0, eCmdHdlrInt, NULL, &iMainMsgQueueSize, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuehighwatermark", 0, eCmdHdlrInt, NULL, &iMainMsgQHighWtrMark, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuelowwatermark", 0, eCmdHdlrInt, NULL, &iMainMsgQLowWtrMark, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuediscardmark", 0, eCmdHdlrInt, NULL, &iMainMsgQDiscardMark, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuediscardseverity", 0, eCmdHdlrSeverity, NULL, &iMainMsgQDiscardSeverity, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuecheckpointinterval", 0, eCmdHdlrInt, NULL, &iMainMsgQPersistUpdCnt, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetype", 0, eCmdHdlrGetWord, setMainMsgQueType, NULL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworkerthreads", 0, eCmdHdlrInt, NULL, &iMainMsgQueueNumWorkers, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutshutdown", 0, eCmdHdlrInt, NULL, &iMainMsgQtoQShutdown, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutactioncompletion", 0, eCmdHdlrInt, NULL, &iMainMsgQtoActShutdown, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuetimeoutenqueue", 0, eCmdHdlrInt, NULL, &iMainMsgQtoEnq, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworketimeoutrthreadshutdown", 0, eCmdHdlrInt, NULL, &iMainMsgQtoWrkShutdown, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuedequeueslowdown", 0, eCmdHdlrInt, NULL, &iMainMsgQDeqSlowdown, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueueworkerthreadminimummessages", 0, eCmdHdlrInt, NULL, &iMainMsgQWrkMinMsgs, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuemaxfilesize", 0, eCmdHdlrSize, NULL, &iMainMsgQueMaxFileSize, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuemaxdiskspace", 0, eCmdHdlrSize, NULL, &iMainMsgQueMaxDiskSpace, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuesaveonshutdown", 0, eCmdHdlrBinary, NULL, &bMainMsgQSaveOnShutdown, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuedequeuetimebegin", 0, eCmdHdlrInt, NULL, &iMainMsgQueueDeqtWinFromHr, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"mainmsgqueuedequeuetimeend", 0, eCmdHdlrInt, NULL, &iMainMsgQueueDeqtWinToHr, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"repeatedmsgreduction", 0, eCmdHdlrBinary, NULL, &bReduceRepeatMsgs, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"actionexeconlywhenpreviousissuspended", 0, eCmdHdlrBinary, NULL, &bActExecWhenPrevSusp, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"actionexeconlyonceeveryinterval", 0, eCmdHdlrInt, NULL, &iActExecOnceInterval, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"actionresumeinterval", 0, eCmdHdlrInt, setActionResumeInterval, NULL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"controlcharacterescapeprefix", 0, eCmdHdlrGetChar, NULL, &cCCEscapeChar, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"escapecontrolcharactersonreceive", 0, eCmdHdlrBinary, NULL, &bEscapeCCOnRcv, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"dropmsgswithmaliciousdnsptrrecords", 0, eCmdHdlrBinary, NULL, &bDropMalPTRMsgs, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"droptrailinglfonreception", 0, eCmdHdlrBinary, NULL, &bDropTrailingLF, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"template", 0, eCmdHdlrCustomHandler, conf.doNameLine, (void*)DIR_TEMPLATE, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"outchannel", 0, eCmdHdlrCustomHandler, conf.doNameLine, (void*)DIR_OUTCHANNEL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"allowedsender", 0, eCmdHdlrCustomHandler, conf.doNameLine, (void*)DIR_ALLOWEDSENDER, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"modload", 0, eCmdHdlrCustomHandler, conf.doModLoad, NULL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"includeconfig", 0, eCmdHdlrCustomHandler, conf.doIncludeLine, NULL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"umask", 0, eCmdHdlrFileCreateMode, setUmask, NULL, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"debugprinttemplatelist", 0, eCmdHdlrBinary, NULL, &bDebugPrintTemplateList, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"debugprintmodulelist", 0, eCmdHdlrBinary, NULL, &bDebugPrintModuleList, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"debugprintcfsyslinehandlerlist", 0, eCmdHdlrBinary,
-		 NULL, &bDebugPrintCfSysLineHandlerList, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"moddir", 0, eCmdHdlrGetWord, NULL, &pModDir, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, NULL));
-
-	/* now add other modules handlers (we should work on that to be able to do it in ClassInit(), but so far
-	 * that is not possible). -- rgerhards, 2008-01-28
-	 */
-	CHKiRet(actionAddCfSysLineHdrl());
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* print version and compile-time setting information.
- */
-static void printVersion(void)
-{
-	printf("rsyslogd %s, ", VERSION);
-	printf("compiled with:\n");
-#ifdef FEATURE_REGEXP
-	printf("\tFEATURE_REGEXP:\t\t\t\tYes\n");
-#else
-	printf("\tFEATURE_REGEXP:\t\t\t\tNo\n");
-#endif
-#ifndef	NOLARGEFILE
-	printf("\tFEATURE_LARGEFILE:\t\t\tYes\n");
-#else
-	printf("\tFEATURE_LARGEFILE:\t\t\tNo\n");
-#endif
-#ifdef	USE_NETZIP
-	printf("\tFEATURE_NETZIP (message compression):\tYes\n");
-#else
-	printf("\tFEATURE_NETZIP (message compression):\tNo\n");
-#endif
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-	printf("\tGSSAPI Kerberos 5 support:\t\tYes\n");
-#else
-	printf("\tGSSAPI Kerberos 5 support:\t\tNo\n");
-#endif
-#ifndef	NDEBUG
-	printf("\tFEATURE_DEBUG (debug build, slow code):\tYes\n");
-#else
-	printf("\tFEATURE_DEBUG (debug build, slow code):\tNo\n");
-#endif
-#ifdef	RTINST
-	printf("\tRuntime Instrumentation (slow code):\tYes\n");
-#else
-	printf("\tRuntime Instrumentation (slow code):\tNo\n");
-#endif
-	printf("\nSee http://www.rsyslog.com for more information.\n");
-}
-
-
-/* This function is called after initial initalization. It is used to
- * move code out of the too-long main() function.
- * rgerhards, 2007-10-17
- */
-static void mainThread()
-{
-	BEGINfunc
-	uchar *pTmp;
-
-	/* Note: signals MUST be processed by the thread this code is running in. The reason
-	 * is that we need to interrupt the select() system call. -- rgerhards, 2007-10-17
-	 */
-
-	/* initialize the build-in templates */
-	pTmp = template_SyslogProtocol23Format;
-	tplAddLine("RSYSLOG_SyslogProtocol23Format", &pTmp);
-	pTmp = template_FileFormat; /* new format for files with high-precision stamp */
-	tplAddLine("RSYSLOG_FileFormat", &pTmp);
-	pTmp = template_TraditionalFileFormat;
-	tplAddLine("RSYSLOG_TraditionalFileFormat", &pTmp);
-	pTmp = template_WallFmt;
-	tplAddLine(" WallFmt", &pTmp);
-	pTmp = template_ForwardFormat;
-	tplAddLine("RSYSLOG_ForwardFormat", &pTmp);
-	pTmp = template_TraditionalForwardFormat;
-	tplAddLine("RSYSLOG_TraditionalForwardFormat", &pTmp);
-	pTmp = template_StdUsrMsgFmt;
-	tplAddLine(" StdUsrMsgFmt", &pTmp);
-	pTmp = template_StdDBFmt;
-	tplAddLine(" StdDBFmt", &pTmp);
-        pTmp = template_StdPgSQLFmt;
-        tplLastStaticInit(tplAddLine(" StdPgSQLFmt", &pTmp));
-
-	init();
-	if(Debug) {
-		dbgprintf("Debugging enabled, SIGUSR1 to turn off debugging.\n");
-		debugging_on = 1;
-	}
-	/* Send a signal to the parent so it can terminate.
-	 */
-	if (myPid != ppid)
-		kill (ppid, SIGTERM);
-
-	/* END OF INTIALIZATION
-	 * ... but keep in mind that we might do a restart and thus init() might
-	 * be called again. If that happens, we must shut down the worker thread,
-	 * do the init() and then restart things.
-	 * rgerhards, 2005-10-24
-	 */
-	dbgprintf("initialization completed, transitioning to regular run mode\n");
-
-	mainloop();
-	ENDfunc
-}
-
-
-/* Method to initialize all global classes and use the objects that we need.
- * rgerhards, 2008-01-04
- * rgerhards, 2008-04-16: the actual initialization is now carried out by the runtime
- */
-static rsRetVal
-InitGlobalClasses(void)
-{
-	DEFiRet;
-	char *pErrObj; /* tells us which object failed if that happens (useful for troubleshooting!) */
-
-	/* Intialize the runtime system */
-	pErrObj = "rsyslog runtime"; /* set in case the runtime errors before setting an object */
-	CHKiRet(rsrtInit(&pErrObj, &obj));
-
-	/* Now tell the system which classes we need ourselfs */
-	pErrObj = "errmsg";
-	CHKiRet(objUse(errmsg,   CORE_COMPONENT));
-	pErrObj = "module";
-	CHKiRet(objUse(module,   CORE_COMPONENT));
-	pErrObj = "var";
-	CHKiRet(objUse(var,      CORE_COMPONENT));
-	pErrObj = "datetime";
-	CHKiRet(objUse(datetime, CORE_COMPONENT));
-	pErrObj = "vm";
-	CHKiRet(objUse(vm,       CORE_COMPONENT));
-	pErrObj = "expr";
-	CHKiRet(objUse(expr,     CORE_COMPONENT));
-	pErrObj = "conf";
-	CHKiRet(objUse(conf,     CORE_COMPONENT));
-
-	/* intialize some dummy classes that are not part of the runtime */
-	pErrObj = "action";
-	CHKiRet(actionClassInit());
-	pErrObj = "template";
-	CHKiRet(templateInit());
-
-	/* TODO: the dependency on net shall go away! -- rgerhards, 2008-03-07 */
-	pErrObj = "net";
-	CHKiRet(objUse(net, LM_NET_FILENAME));
-
-finalize_it:
-	if(iRet != RS_RET_OK) {
-		/* we know we are inside the init sequence, so we can safely emit
-		 * messages to stderr. -- rgerhards, 2008-04-02
-		 */
-		fprintf(stderr, "Error during class init for object '%s' - failing...\n", pErrObj);
-	}
-
-	RETiRet;
-}
-
-
-/* Method to exit all global classes. We do not do any error checking here,
- * because that wouldn't help us at all. So better try to deinit blindly
- * as much as succeeds (which usually means everything will). We just must
- * be careful to do the de-init in the opposite order of the init, because
- * of the dependencies. However, its not as important this time, because
- * we have reference counting.
- * rgerhards, 2008-03-10
- */
-static rsRetVal
-GlobalClassExit(void)
-{
-	DEFiRet;
-
-	/* first, release everything we used ourself */
-	objRelease(net,      LM_NET_FILENAME);/* TODO: the dependency on net shall go away! -- rgerhards, 2008-03-07 */
-	objRelease(conf,     CORE_COMPONENT);
-	objRelease(expr,     CORE_COMPONENT);
-	objRelease(vm,       CORE_COMPONENT);
-	objRelease(var,      CORE_COMPONENT);
-	objRelease(datetime, CORE_COMPONENT);
-
-	/* TODO: implement the rest of the deinit */
-#if 0
-	CHKiRet(datetimeClassInit(NULL));
-	CHKiRet(msgClassInit(NULL));
-	CHKiRet(strmClassInit(NULL));
-	CHKiRet(wtiClassInit(NULL));
-	CHKiRet(wtpClassInit(NULL));
-	CHKiRet(queueClassInit(NULL));
-	CHKiRet(vmstkClassInit(NULL));
-	CHKiRet(sysvarClassInit(NULL));
-	CHKiRet(vmClassInit(NULL));
-	CHKiRet(vmopClassInit(NULL));
-	CHKiRet(vmprgClassInit(NULL));
-	CHKiRet(ctok_tokenClassInit(NULL));
-	CHKiRet(ctokClassInit(NULL));
-	CHKiRet(exprClassInit(NULL));
-
-	/* dummy "classes" */
-	CHKiRet(actionClassInit());
-	CHKiRet(templateInit());
-#endif
-	/* dummy "classes */
-	strExit();
-
-#if 0
-	CHKiRet(objGetObjInterface(&obj)); /* this provides the root pointer for all other queries */
-	/* the following classes were intialized by objClassInit() */
-	CHKiRet(objUse(errmsg,   CORE_COMPONENT));
-	CHKiRet(objUse(module,   CORE_COMPONENT));
-#endif
-	rsrtExit(&obj); /* *THIS* *MUST/SHOULD?* always be the first class initilizer being called (except debug)! */
-
-	RETiRet;
-}
-
-
-/* some support for command line option parsing. Any non-trivial options must be
- * buffered until the complete command line has been parsed. This is necessary to
- * prevent dependencies between the options. That, in turn, means we need to have
- * something that is capable of buffering options and there values. The follwing
- * functions handle that.
- * rgerhards, 2008-04-04
- */
-typedef struct bufOpt {
-	struct bufOpt *pNext;
-	char optchar;
-	char *arg;
-} bufOpt_t;
-static bufOpt_t *bufOptRoot = NULL;
-static bufOpt_t *bufOptLast = NULL;
-
-/* add option buffer */
-static rsRetVal
-bufOptAdd(char opt, char *arg)
-{
-	DEFiRet;
-	bufOpt_t *pBuf;
-
-	if((pBuf = malloc(sizeof(bufOpt_t))) == NULL)
-		ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY);
-
-	pBuf->optchar = opt;
-	pBuf->arg = arg;
-	pBuf->pNext = NULL;
-
-	if(bufOptLast == NULL) {
-		bufOptRoot = pBuf; /* then there is also no root! */
-	} else {
-		bufOptLast->pNext = pBuf;
-	}
-	bufOptLast = pBuf;
-
-finalize_it:
-	RETiRet;
-}
-
-
-
-/* remove option buffer from top of list, return values and destruct buffer itself.
- * returns RS_RET_END_OF_LINKEDLIST when no more options are present.
- * (we use int *opt instead of char *opt to keep consistent with getopt())
- */
-static rsRetVal
-bufOptRemove(int *opt, char **arg)
-{
-	DEFiRet;
-	bufOpt_t *pBuf;
-
-	if(bufOptRoot == NULL)
-		ABORT_FINALIZE(RS_RET_END_OF_LINKEDLIST);
-	pBuf = bufOptRoot;
-
-	*opt = pBuf->optchar;
-	*arg = pBuf->arg;
-
-	bufOptRoot = pBuf->pNext;
-	free(pBuf);
-
-finalize_it:
-	RETiRet;
-}
-
-
-/* This is the main entry point into rsyslogd. Over time, we should try to
- * modularize it a bit more...
- */
-int realMain(int argc, char **argv)
-{	
-	DEFiRet;
-
-	register int i;
-	register char *p;
-	int num_fds;
-	int ch;
-	struct hostent *hent;
-	extern int optind;
-	extern char *optarg;
-	struct sigaction sigAct;
-	int bIsFirstOption = 1;
-	int bEOptionWasGiven = 0;
-	int bImUxSockLoaded = 0; /* already generated a $ModLoad imuxsock? */
-	char *arg;	/* for command line option processing */
-	uchar legacyConfLine[80];
-
-	/* first, parse the command line options. We do not carry out any actual work, just
-	 * see what we should do. This relieves us from certain anomalies and we can process
-	 * the parameters down below in the correct order. For example, we must know the
-	 * value of -M before we can do the init, but at the same time we need to have
-	 * the base classes init before we can process most of the options. Now, with the
-	 * split of functionality, this is no longer a problem. Thanks to varmofekoj for
-	 * suggesting this algo.
-	 * Note: where we just need to set some flags and can do so without knowledge
-	 * of other options, we do this during the inital option processing. With later
-	 * versions (if a dependency on -c option is introduced), we must move that code
-	 * to other places, but I think it is quite appropriate and saves code to do this
-	 * only when actually neeeded. 
-	 * rgerhards, 2008-04-04
-	 */
-	while ((ch = getopt(argc, argv, "46aAc:def:g:hi:l:m:M:nopqQr::s:t:u:vwx")) != EOF) {
-		switch((char)ch) {
-                case '4':
-                case '6':
-                case 'A':
-                case 'a':
-		case 'f': /* configuration file */
-		case 'h':
-		case 'i': /* pid file name */
-		case 'l':
-		case 'm': /* mark interval */
-		case 'n': /* don't fork */
-                case 'o':
-                case 'p':
-		case 'q': /* add hostname if DNS resolving has failed */
-		case 'Q': /* dont resolve hostnames in ACL to IPs */
-		case 's':
-		case 'u': /* misc user settings */
-		case 'w': /* disable disallowed host warnigs */
-		case 'x': /* disable dns for remote messages */
-			CHKiRet(bufOptAdd(ch, optarg));
-			break;
-		case 'c':		/* compatibility mode */
-			if(!bIsFirstOption) {
-				fprintf(stderr, "-c option MUST be specified as the first option - aborting...\n");
-				usage();
-				exit(1);
-			}
-			iCompatibilityMode = atoi(optarg);
-			break;
-		case 'd': /* debug - must be handled now, so that debug is active during init! */
-			Debug = 1;
-			break;
-		case 'e':		/* log every message (no repeat message supression) */
-			fprintf(stderr, "note: -e option is no longer supported, every message is now logged by default\n");
-			bEOptionWasGiven = 1;
-			break;
-		case 'g':		/* enable tcp gssapi logging */
-#if defined(SYSLOG_INET) && defined(USE_GSSAPI)
-			CHKiRet(bufOptAdd('g', optarg));
-#else
-			fprintf(stderr, "rsyslogd: -g not valid - not compiled with gssapi support");
-#endif
-			break;
-		case 'M': /* default module load path -- this MUST be carried out immediately! */
-			glblModPath = (uchar*) optarg;
-			break;
-		case 'r':		/* accept remote messages */
-#ifdef SYSLOG_INET
-			CHKiRet(bufOptAdd(ch, optarg));
-#else
-			fprintf(stderr, "rsyslogd: -r not valid - not compiled with network support\n");
-#endif
-			break;
-		case 't':		/* enable tcp logging */
-#ifdef SYSLOG_INET
-			CHKiRet(bufOptAdd(ch, optarg));
-#else
-			fprintf(stderr, "rsyslogd: -t not valid - not compiled with network support\n");
-#endif
-			break;
-		case 'v': /* MUST be carried out immediately! */
-			printVersion();
-			exit(0); /* exit for -v option - so this is a "good one" */
-		case '?':              
-		default:
-			usage();
-		}
-		bIsFirstOption = 0; /* we already saw an option character */
-	}
-
-	if ((argc -= optind))
-		usage();
-
-	dbgprintf("rsyslogd %s startup, compatibility mode %d, module path '%s'\n",
-		  VERSION, iCompatibilityMode, glblModPath == NULL ? "" : (char*)glblModPath);
-
-	/* we are done with the initial option parsing and processing. Now we init the system. */
-
-	ppid = getpid();
-
-	if(chdir ("/") != 0)
-		fprintf(stderr, "Can not do 'cd /' - still trying to run\n");
-
-	CHKiRet_Hdlr(InitGlobalClasses()) {
-		fprintf(stderr, "rsyslogd initializiation failed - global classes could not be initialized.\n"
-				"Did you do a \"make install\"?\n"
-				"Suggested action: run rsyslogd with -d -n options to see what exactly "
-				"fails.\n");
-		FINALIZE;
-	}
-
-	/* doing some core initializations */
-
-	/* get our host and domain names - we need to do this early as we may emit
-	 * error log messages, which need the correct hostname. -- rgerhards, 2008-04-04
-	 */
-	net.getLocalHostname(&LocalHostName);
-	if((p = strchr((char*)LocalHostName, '.'))) {
-		*p++ = '\0';
-		LocalDomain = p;
-	} else {
-		LocalDomain = "";
-
-		/* It's not clearly defined whether gethostname()
-		 * should return the simple hostname or the fqdn. A
-		 * good piece of software should be aware of both and
-		 * we want to distribute good software.  Joey
-		 *
-		 * Good software also always checks its return values...
-		 * If syslogd starts up before DNS is up & /etc/hosts
-		 * doesn't have LocalHostName listed, gethostbyname will
-		 * return NULL. 
-		 */
-		/* TODO: gethostbyname() is not thread-safe, but replacing it is
-		 * not urgent as we do not run on multiple threads here. rgerhards, 2007-09-25
-		 */
-		hent = gethostbyname((char*)LocalHostName);
-		if(hent) {
-			free(LocalHostName);
-			CHKmalloc(LocalHostName = (uchar*)strdup(hent->h_name));
-				
-			if((p = strchr((char*)LocalHostName, '.')))
-			{
-				*p++ = '\0';
-				LocalDomain = p;
-			}
-		}
-	}
-
-	/* Convert to lower case to recognize the correct domain laterly */
-	for (p = (char *)LocalDomain ; *p ; p++)
-		*p = (char)tolower((int)*p);
-
-	/* initialize the objects */
-	if((iRet = modInitIminternal()) != RS_RET_OK) {
-		fprintf(stderr, "fatal error: could not initialize errbuf object (error code %d).\n",
-			iRet);
-		exit(1); /* "good" exit, leaving at init for fatal error */
-	}
-
-	if((iRet = loadBuildInModules()) != RS_RET_OK) {
-		fprintf(stderr, "fatal error: could not activate built-in modules. Error code %d.\n",
-			iRet);
-		exit(1); /* "good" exit, leaving at init for fatal error */
-	}
-
-	/* END core initializations - we now come back to carrying out command line options*/
-
-	while((iRet = bufOptRemove(&ch, &arg)) == RS_RET_OK) {
-		dbgprintf("deque option %c, optarg '%s'\n", ch, arg);
-		switch((char)ch) {
-                case '4':
-	                family = PF_INET;
-                        break;
-                case '6':
-                        family = PF_INET6;
-                        break;
-                case 'A':
-                        send_to_all++;
-                        break;
-                case 'a':
-			if(iCompatibilityMode < 3) {
-				if(!bImUxSockLoaded) {
-					legacyOptsEnq((uchar *) "ModLoad imuxsock");
-					bImUxSockLoaded = 1;
-				}
-				snprintf((char *) legacyConfLine, sizeof(legacyConfLine), "addunixlistensocket %s", arg);
-				legacyOptsEnq(legacyConfLine);
-			} else {
-				fprintf(stderr, "error -a is no longer supported, use module imuxsock instead");
-			}
-                        break;
-		case 'f':		/* configuration file */
-			ConfFile = (uchar*) arg;
-			break;
-		case 'g':		/* enable tcp gssapi logging */
-			if(iCompatibilityMode < 3) {
-				legacyOptsParseTCP(ch, arg);
-			} else
-				fprintf(stderr,	"-g option only supported in compatibility modes 0 to 2 - ignored\n");
-			break;
-		case 'h':
-			if(iCompatibilityMode < 3) {
-				errmsg.LogError(NO_ERRCODE, "WARNING: -h option is no longer supported - ignored");
-			} else {
-				usage(); /* for v3 and above, it simply is an error */
-			}
-			break;
-		case 'i':		/* pid file name */
-			PidFile = arg;
-			break;
-		case 'l':
-			if (LocalHosts) {
-				fprintf (stderr, "rsyslogd: Only one -l argument allowed, the first one is taken.\n");
-			} else {
-				LocalHosts = crunch_list(arg);
-			}
-			break;
-		case 'm':		/* mark interval */
-			if(iCompatibilityMode < 3) {
-				MarkInterval = atoi(arg) * 60;
-			} else
-				fprintf(stderr,
-					"-m option only supported in compatibility modes 0 to 2 - ignored\n");
-			break;
-		case 'n':		/* don't fork */
-			NoFork = 1;
-			break;
-                case 'o':
-			if(iCompatibilityMode < 3) {
-				if(!bImUxSockLoaded) {
-					legacyOptsEnq((uchar *) "ModLoad imuxsock");
-					bImUxSockLoaded = 1;
-				}
-				legacyOptsEnq((uchar *) "OmitLocalLogging");
-			} else {
-				fprintf(stderr, "error -o is no longer supported, use module imuxsock instead");
-			}
-                        break;
-                case 'p':
-			if(iCompatibilityMode < 3) {
-				if(!bImUxSockLoaded) {
-					legacyOptsEnq((uchar *) "ModLoad imuxsock");
-					bImUxSockLoaded = 1;
-				}
-				snprintf((char *) legacyConfLine, sizeof(legacyConfLine), "SystemLogSocketName %s", arg);
-				legacyOptsEnq(legacyConfLine);
-			} else {
-				fprintf(stderr, "error -p is no longer supported, use module imuxsock instead");
-			}
-		case 'q':               /* add hostname if DNS resolving has failed */
-		        *net.pACLAddHostnameOnFail = 1;
-		        break;
-		case 'Q':               /* dont resolve hostnames in ACL to IPs */
-		        *net.pACLDontResolve = 1;
-		        break;
-		case 'r':		/* accept remote messages */
-			if(iCompatibilityMode < 3) {
-				legacyOptsEnq((uchar *) "ModLoad imudp");
-				snprintf((char *) legacyConfLine, sizeof(legacyConfLine), "UDPServerRun %s", arg);
-				legacyOptsEnq(legacyConfLine);
-			} else
-				fprintf(stderr, "-r option only supported in compatibility modes 0 to 2 - ignored\n");
-			break;
-		case 's':
-			if (StripDomains) {
-				fprintf (stderr, "rsyslogd: Only one -s argument allowed, the first one is taken.\n");
-			} else {
-				StripDomains = crunch_list(arg);
-			}
-			break;
-		case 't':		/* enable tcp logging */
-			if(iCompatibilityMode < 3) {
-				legacyOptsParseTCP(ch, arg);
-			} else
-				fprintf(stderr,	"-t option only supported in compatibility modes 0 to 2 - ignored\n");
-			break;
-		case 'u':		/* misc user settings */
-			if(atoi(arg) == 1)
-				bParseHOSTNAMEandTAG = 0;
-			break;
-		case 'w':		/* disable disallowed host warnigs */
-			option_DisallowWarning = 0;
-			break;
-		case 'x':		/* disable dns for remote messages */
-			DisableDNS = 1;
-			break;
-		case '?':              
-		default:
-			usage();
-		}
-	}
-
-	if(iRet != RS_RET_END_OF_LINKEDLIST)
-		FINALIZE;
-
-	/* process compatibility mode settings */
-	if(iCompatibilityMode < 3) {
-		errmsg.LogError(NO_ERRCODE, "WARNING: rsyslogd is running in compatibility mode. Automatically "
-		                            "generated config directives may interfer with your rsyslog.conf settings. "
-					    "We suggest upgrading your config and adding -c3 as the first "
-					    "rsyslogd option.");
-		if(MarkInterval > 0) {
-			legacyOptsEnq((uchar *) "ModLoad immark");
-			snprintf((char *) legacyConfLine, sizeof(legacyConfLine), "MarkMessagePeriod %d", MarkInterval);
-			legacyOptsEnq(legacyConfLine);
-		}
-		if(!bImUxSockLoaded) {
-			legacyOptsEnq((uchar *) "ModLoad imuxsock");
-		}
-	}
-
-	if(bEOptionWasGiven && iCompatibilityMode < 3) {
-		errmsg.LogError(NO_ERRCODE, "WARNING: \"message repeated n times\" feature MUST be turned on in "
-					    "rsyslog.conf - CURRENTLY EVERY MESSAGE WILL BE LOGGED. Visit "
-					    "http://www.rsyslog.com/rptdmsgreduction to learn "
-					    "more and cast your vote if you want us to keep this feature.");
-	}
-
-	checkPermissions();
-	thrdInit();
-
-	if( !(Debug || NoFork) )
-	{
-		dbgprintf("Checking pidfile.\n");
-		if (!check_pid(PidFile))
-		{
-			memset(&sigAct, 0, sizeof (sigAct));
-			sigemptyset(&sigAct.sa_mask);
-			sigAct.sa_handler = doexit;
-			sigaction(SIGTERM, &sigAct, NULL);
-
-			if (fork()) {
-				/*
-				 * Parent process
-				 */
-				sleep(300);
-				/*
-				 * Not reached unless something major went wrong.  5
-				 * minutes should be a fair amount of time to wait.
-				 * Please note that this procedure is important since
-				 * the father must not exit before syslogd isn't
-				 * initialized or the klogd won't be able to flush its
-				 * logs.  -Joey
-				 */
-				exit(1); /* "good" exit - after forking, not diasabling anything */
-			}
-			num_fds = getdtablesize();
-			for (i= 0; i < num_fds; i++)
-				(void) close(i);
-			untty();
-		}
-		else
-		{
-			fputs(" Already running.\n", stderr);
-			exit(1); /* "good" exit, done if syslogd is already running */
-		}
-	}
-	else
-		debugging_on = 1;
-
-	/* tuck my process id away */
-	dbgprintf("Writing pidfile %s.\n", PidFile);
-	if (!check_pid(PidFile))
-	{
-		if (!write_pid(PidFile))
-		{
-			fputs("Can't write pid.\n", stderr);
-			exit(1); /* exit during startup - questionable */
-		}
-	}
-	else
-	{
-		fputs("Pidfile (and pid) already exist.\n", stderr);
-		exit(1); /* exit during startup - questionable */
-	}
-	myPid = getpid(); 	/* save our pid for further testing (also used for messages) */
-
-	memset(&sigAct, 0, sizeof (sigAct));
-	sigemptyset(&sigAct.sa_mask);
-
-	sigAct.sa_handler = sigsegvHdlr;
-	sigaction(SIGSEGV, &sigAct, NULL);
-	sigAct.sa_handler = sigsegvHdlr;
-	sigaction(SIGABRT, &sigAct, NULL);
-	sigAct.sa_handler = doDie;
-	sigaction(SIGTERM, &sigAct, NULL);
-	sigAct.sa_handler = Debug ? doDie : SIG_IGN;
-	sigaction(SIGINT, &sigAct, NULL);
-	sigaction(SIGQUIT, &sigAct, NULL);
-	sigAct.sa_handler = reapchild;
-	sigaction(SIGCHLD, &sigAct, NULL);
-	sigAct.sa_handler = Debug ? debug_switch : SIG_IGN;
-	sigaction(SIGUSR1, &sigAct, NULL);
-	sigAct.sa_handler = SIG_IGN;
-	sigaction(SIGPIPE, &sigAct, NULL);
-	sigaction(SIGXFSZ, &sigAct, NULL); /* do not abort if 2gig file limit is hit */
-
-	mainThread();
-
-	/* do any de-init's that need to be done AFTER this comment */
-
-	die(bFinished);
-	
-	thrdExit();
-
-finalize_it:
-	if(iRet != RS_RET_OK)
-		fprintf(stderr, "rsyslogd run failed with error %d\n(see rsyslog.h "
-				"or http://www.rsyslog.com/errcode to learn what that number means)\n", iRet);
-
-	ENDfunc
-	return 0;
-}
-
-
-/* This is the main entry point into rsyslogd. This must be a function in its own
- * right in order to intialize the debug system in a portable way (otherwise we would
- * need to have a statement before variable definitions.
- * rgerhards, 20080-01-28
- */
-int main(int argc, char **argv)
-{	
-	dbgClassInit();
-	return realMain(argc, argv);
-}
-
-/* vim:set ai:
- */