Merge branch 'master' into beta

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html

1 files changed, 2 insertions, 4 deletions

diff --git a/dirty.h b/dirty.h
index 2cf00b40..796df18e 100644
--- a/dirty.h
+++ b/dirty.h
@@ -27,14 +27,12 @@
 #ifndef	DIRTY_H_INCLUDED
 #define	DIRTY_H_INCLUDED 1
 
-#define	MAXLINE		2048		/* maximum line length */
-
 /* Flags to logmsg().
  */
 #define NOFLAG		0x000	/* no flag is set (to be used when a flag must be specified and none is required) */
 #define INTERNAL_MSG	0x001	/* msg generated by logmsgInternal() --> special handling */
 /* NO LONGER USED: #define SYNC_FILE	0x002	/ * do fsync on file after printing */
-#define ADDDATE		0x004	/* add a date to the message */
+#define IGNDATE		0x004	/* ignore, if given, date in message and use date of reception as msg date */
 #define MARK		0x008	/* this message is a mark */
 
 #define MSG_PARSE_HOSTNAME 1
@@ -42,7 +40,7 @@
 
 rsRetVal submitMsg(msg_t *pMsg);
 rsRetVal logmsgInternal(int iErr, int pri, uchar *msg, int flags);
-rsRetVal parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int bParseHost, int flags, flowControl_t flowCtlType);
+rsRetVal parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int bParseHost, int flags, flowControl_t flowCtlTypeu, uchar *pszInputName);
 
 /* TODO: the following 2 need to go in conf obj interface... */
 rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEntry, int iTplOpts, uchar *dfltTplName);