diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 12:59:55 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 12:59:55 +0200 |
commit | 98348ae03d217d1971c54ff135b6a5ce1dff7087 (patch) | |
tree | cced038bdf003e375a77a47aa7ea7b4183553664 /plugins/imudp | |
parent | 4af40abc0a9cdc9f328830b6074f6182f43c171a (diff) | |
parent | 74b2b24f508be90d20961304d5e3cce648f3eb7c (diff) | |
download | rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.gz rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.xz rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.zip |
Merge branch 'master' into omfile
Conflicts:
ChangeLog
runtime/msg.h
tcps_sess.c
tcpsrv.c
tools/syslogd.c
Diffstat (limited to 'plugins/imudp')
-rw-r--r-- | plugins/imudp/imudp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index 50e8efaf..97e66e8e 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -6,7 +6,7 @@ * * File begun on 2007-12-21 by RGerhards (extracted from syslogd.c) * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2009 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -245,7 +245,7 @@ processSocket(int fd, struct sockaddr_storage *frominetPrev, int *pbIsPermitted, CHKmalloc(pMsg->pszRawMsg = malloc(sizeof(uchar)* lenRcvBuf)); memcpy(pMsg->pszRawMsg, pRcvBuf, lenRcvBuf); pMsg->iLenRawMsg = lenRcvBuf; - MsgSetInputName(pMsg, UCHAR_CONSTANT("imudp")); + MsgSetInputName(pMsg, UCHAR_CONSTANT("imudp"), sizeof("imudp")-1); MsgSetFlowControlType(pMsg, eFLOWCTL_NO_DELAY); pMsg->msgFlags = NEEDS_PARSING | PARSE_HOSTNAME; pMsg->bParseHOSTNAME = 1; |