Merge branch 'c9'

Conflicts:
	runtime/msg.c

1 files changed, 4 insertions, 0 deletions

diff --git a/tcpsrv.h b/tcpsrv.h
index c9d491db..7fe517a4 100644
--- a/tcpsrv.h
+++ b/tcpsrv.h
@@ -43,6 +43,7 @@ struct tcpLstnPortList_s {
 	statsobj_t *stats;		/**< associated stats object */
 	sbool bSuppOctetFram;	/**< do we support octect-counted framing? (if no->legay only!)*/
 	ratelimit_t *ratelimiter;
+	uchar dfltTZ[8];		/**< default TZ if none in timestamp; '\0' =No Default */
 	STATSCOUNTER_DEF(ctrSubmit, mutCtrSubmit)
 	tcpLstnPortList_t *pNext;	/**< next port or NULL */
 };
@@ -67,6 +68,7 @@ struct tcpsrv_s {
 	tcpLstnPortList_t **ppLstnPort; /**< pointer to relevant listen port description */
 	int iLstnMax;		/**< max number of listeners supported */
 	int iSessMax;		/**< max number of sessions supported */
+	uchar dfltTZ[8];	/**< default TZ if none in timestamp; '\0' =No Default */
 	tcpLstnPortList_t *pLstnPorts;	/**< head pointer for listen ports */
 
 	int addtlFrameDelim;	/**< additional frame delimiter for plain TCP syslog framing (e.g. to handle NetScreen) */
@@ -147,6 +149,8 @@ BEGINinterface(tcpsrv) /* name must also be changed in ENDinterface macro! */
 	rsRetVal (*SetKeepAlive)(tcpsrv_t*, int);
 	/* added v13 -- rgerhards, 2012-10-15 */
 	rsRetVal (*SetLinuxLikeRatelimiters)(tcpsrv_t *pThis, int interval, int burst);
+	/* added v14 -- rgerhards, 2013-07-28 */
+	rsRetVal (*SetDfltTZ)(tcpsrv_t *pThis, uchar *dfltTZ);
 ENDinterface(tcpsrv)
 #define tcpsrvCURR_IF_VERSION 13 /* increment whenever you change the interface structure! */
 /* change for v4: