Merge branch 'beta'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html

5 files changed, 41 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index bf1c37e8..8f868156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,10 +18,22 @@ Version 7.3.0  [devel] 2012-10-09
   This was achieved by somewhat reducing the robustness of the zip archive.
   This is controlled by the new action parameter "VeryReliableZip".
 ---------------------------------------------------------------------------
-Version 7.1.11  [beta] 2012-10-??
+Version 7.1.12  [beta] 2012-10-??
+- minor updates to better support newer systemd developments
+  Thanks to Michael Biebl for the patches.
+- cleanup: removed remains of -c option (compatibility mode)
+  both from code & doc and emitted warning message if still used
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
+  Thanks to Michael Biebl for reporting & suggestions
+----------------------------------------------------------------------------
+Version 7.1.11  [beta] 2012-10-16
+- bugfix: imuxsock truncated head of received message
+  This happened only under some circumstances. Thanks to Marius
+  Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+  solving this issue.
 - bugfix: do not crash if set statement is used with date field
   Thanks to Miloslav Trmač for the patch.
-- change lumberjack cookie to "@cee" from "@cee "
+- change lumberjack cookie to "@cee:" from "@cee: "
   CEE originally specified the cookie with SP, whereas other lumberjack
   tools used it without space. In order to keep interop with lumberjack,
   we now use the cookie without space as well. I hope this can be changed
@@ -29,7 +41,7 @@ Version 7.1.11  [beta] 2012-10-??
   Thanks to Miloslav Trmač for pointing this out and a similiar v7 patch.
 - added deprecated note to omruleset (plus clue to use "call")
 - added deprecated note to discard action (plus clue to use "stop")
- ---------------------------------------------------------------------------
+---------------------------------------------------------------------------
 Version 7.1.10  [beta] 2012-10-11
  - bugfix: m4 directory was not present in release tarball
  - bugfix: small memory leak with string-type templates
@@ -37,7 +49,7 @@ Version 7.1.10  [beta] 2012-10-11
  - bugfix: some config processing warning messages were treated as errors
  - bugfix: small memory leak when processing action() statements
  - bugfix: unknown action() parameters were not reported
- ---------------------------------------------------------------------------
+---------------------------------------------------------------------------
 Version 7.1.9  [beta] 2012-10-09
 - bugfix: comments inside objects (e.g. action()) were not properly handled
 - bugfix: in (non)equal comparisons the position of arrays influenced result
@@ -187,7 +199,15 @@ Version 6.5.0  [devel] 2012-08-28
   http://bugzilla.adiscon.com/show_bug.cgi?id=353
 ---------------------------------------------------------------------------
 Version 6.4.3  [V6-STABLE] 2012-??-??
-- change lumberjack cookie to "@cee" from "@cee "
+- cleanup: removed remains of -c option (compatibility mode)
+  both from code & doc and emitted warning message if still used
+  closes: http://bugzilla.adiscon.com/show_bug.cgi?id=361
+  Thanks to Michael Biebl for reporting & suggestions
+- bugfix: imuxsock truncated head of received message
+  This happened only under some circumstances. Thanks to Marius
+  Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+  solving this issue.
+- change lumberjack cookie to "@cee:" from "@cee: "
   CEE originally specified the cookie with SP, whereas other lumberjack
   tools used it without space. In order to keep interop with lumberjack,
   we now use the cookie without space as well. I hope this can be changed
@@ -768,6 +788,10 @@ expected that interfaces, even new ones, break during the initial
   [ported from v4]
 ---------------------------------------------------------------------------
 Version 5.10.1  [V5-STABLE], 2012-0?-??
+- bugfix: imuxsock truncated head of received message
+  This happened only under some circumstances. Thanks to Marius
+  Tomaschwesky, Florian Piekert and Milan Bartos for their help in
+  solving this issue.
 - enable DNS resolution in imrelp
   Thanks to Apollon Oikonomopoulos for the patch
 - bugfix: invalid property name in property-filter could cause abort
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index a4933115..79d8c5d0 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -915,7 +915,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 	CHKiRet(msgConstructWithTime(&pMsg, &st, tt));
 	MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv);
 	parser.SanitizeMsg(pMsg);
-	lenMsg = pMsg->iLenRawMsg - offs;
+	lenMsg = pMsg->iLenRawMsg - offs; /* SanitizeMsg() may have changed the size */
 	MsgSetInputName(pMsg, pInputName);
 	MsgSetFlowControlType(pMsg, pLstn->flowCtl);
 
@@ -952,7 +952,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 			parse[15] = ' '; /* re-write \0 from fromatTimestamp3164 by SP */
 			/* update "counters" to reflect processed timestamp */
 			parse += 16;
-			lenMsg -= 16;
 		}
 	}
 
@@ -967,12 +966,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred, struct tim
 	if(pLstn->bWritePid)
 		fixPID(bufParseTAG, &i, cred);
 	MsgSetTAG(pMsg, bufParseTAG, i);
-
-	if (pLstn->bAnnotate) {
-		MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg - 16);
-	} else {
-		MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg);
-	}
+	MsgSetMSGoffs(pMsg, pMsg->iLenRawMsg - lenMsg);
 
 	if(pLstn->bParseHost) {
 		pMsg->msgFlags  = pLstn->flags | PARSE_HOSTNAME;
diff --git a/rsyslog.service.in b/rsyslog.service.in
index a5d53ad2..08a4870f 100644
--- a/rsyslog.service.in
+++ b/rsyslog.service.in
@@ -2,8 +2,7 @@
 Description=System Logging Service
 
 [Service]
-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
-ExecStart=@sbindir@/rsyslogd -n -c6
+ExecStart=@sbindir@/rsyslogd -n
 Sockets=syslog.socket
 StandardOutput=null
 
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8
index 6ac30e46..36f29769 100644
--- a/tools/rsyslogd.8
+++ b/tools/rsyslogd.8
@@ -1,7 +1,7 @@
 .\" Copyright 2004-2008 Rainer Gerhards and Adiscon for the rsyslog modifications
 .\" May be distributed under the GNU General Public License
 .\"
-.TH RSYSLOGD 8 "29 July 2008" "Version 3.21.1" "Linux System Administration"
+.TH RSYSLOGD 8 "16 October 2012" "Version 6.4.3" "Linux System Administration"
 .SH NAME
 rsyslogd \- reliable and extended syslogd 
 .SH SYNOPSIS
@@ -93,9 +93,6 @@ the error element is ignored. It is tried to parse the rest of the line.
 
 .LP
 .SH OPTIONS
-.B Note that in version 3 of rsyslog a number of command line options
-.B have been deprecated and replaced with config file directives. The
-.B -c option controls the backward compatibility mode in use.
 .TP
 .BI "\-A"
 When sending UDP messages, there are potentially multiple paths to
@@ -123,26 +120,9 @@ If neither -4 nor -6 is given,
 listens to all configured addresses of the system.
 .TP
 .BI "\-c " "version"
-Selects the desired backward compatibility mode. It must always be the
-first option on the command line, as it influences processing of the
-other options. To use the rsyslog v3 native interface, specify -c3. To
-use compatibility mode , either do not use -c at all or use
--c<version> where 
-.IR version
-is the rsyslog version that it shall be
-compatible with. Using -c0 tells rsyslog to be command-line compatible
-to sysklogd, which is the default if -c is not given.
-.B Please note that rsyslogd issues warning messages if the -c3
-.B command line option is not given.
-This is to alert you that your are running in compatibility
-mode. Compatibility mode interferes with your rsyslog.conf commands and
-may cause some undesired side-effects. It is meant to be used with a
-plain old rsyslog.conf - if you use new features, things become
-messy. So the best advice is to work through this document, convert
-your options and config file and then use rsyslog in native mode. In
-order to aid you in this process, rsyslog logs every
-compatibility-mode config file directive it has generated. So you can
-simply copy them from your logfile and paste them to the config.
+This option has been obsolted and has no function any longer. It is still
+accepted in order not to break existing scripts. However, future versions
+may not support it.
 .TP
 .B "\-d"
 Turns on debug mode.  Using this the daemon will not proceed a 
diff --git a/tools/syslogd.c b/tools/syslogd.c
index 8ba8edd3..edb546a1 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -219,11 +219,6 @@ struct queuefilenames_s {
 	uchar *name;
 } *queuefilenames = NULL;
 
-/* global variables for config file state */
-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. */
-/* end global config file state variables */
 
 int	MarkInterval = 20 * 60;	/* interval between marks in seconds - read-only after startup */
 int      send_to_all = 0;        /* send message to all IPv4/IPv6 addresses */
@@ -249,10 +244,9 @@ static void sighup_handler();
 
 static int usage(void)
 {
-	fprintf(stderr, "usage: rsyslogd [-c<version>] [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
+	fprintf(stderr, "usage: rsyslogd [-46AdnqQvwx] [-l<hostlist>] [-s<domainlist>]\n"
 			"                [-f<conffile>] [-i<pidfile>] [-N<level>] [-M<module load path>]\n"
 			"                [-u<number>]\n"
-			"To run rsyslogd in native mode, use \"rsyslogd -c5 <other options>\"\n\n"
 			"For further information see http://www.rsyslog.com/doc\n");
 	exit(1); /* "good" exit - done to terminate usage() */
 }
@@ -1833,10 +1827,7 @@ int realMain(int argc, char **argv)
 	 * 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.
+	 * of other options, we do this during the inital option processing.
 	 * rgerhards, 2008-04-04
 	 */
 	while((ch = getopt(argc, argv, "46a:Ac:def:g:hi:l:m:M:nN:op:qQr::s:t:T:u:vwx")) != EOF) {
@@ -1867,7 +1858,7 @@ int realMain(int argc, char **argv)
 			CHKiRet(bufOptAdd(ch, optarg));
 			break;
 		case 'c':		/* compatibility mode */
-			iCompatibilityMode = atoi(optarg);
+			fprintf(stderr, "rsyslogd: error: option -c is no longer supported - ignored");
 			break;
 		case 'd': /* debug - must be handled now, so that debug is active during init! */
 			debugging_on = 1;
@@ -1891,8 +1882,8 @@ int realMain(int argc, char **argv)
 	if(argc - optind)
 		usage();
 
-	DBGPRINTF("rsyslogd %s startup, compatibility mode %d, module path '%s', cwd:%s\n",
-		  VERSION, iCompatibilityMode, glblModPath == NULL ? "" : (char*)glblModPath,
+	DBGPRINTF("rsyslogd %s startup, module path '%s', cwd:%s\n",
+		  VERSION, glblModPath == NULL ? "" : (char*)glblModPath,
 		  getcwd(cwdbuf, sizeof(cwdbuf)));
 
 	/* we are done with the initial option parsing and processing. Now we init the system. */