summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-01 16:30:32 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-01 16:30:32 +0200
commit176f773a2e7d29d45e06980e684d293fa3352d72 (patch)
tree341540dbc9b77459410f840022dc75f30d668924 /plugins
parent8bab264ba168b5fee36a7b45020e5e2172c74224 (diff)
parente13537ce909e8e6ab0b9d404c1e4870980c6dacf (diff)
downloadrsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.tar.gz
rsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.tar.xz
rsyslog-176f773a2e7d29d45e06980e684d293fa3352d72.zip
Merge branch 'v4-stable' into v4-beta & BUGFIX
Conflicts: configure.ac doc/manual.html runtime/datetime.h runtime/parser.c runtime/rsyslog.h tools/syslogd.c v4-stable had a bug with RFC5424-formatted structured data, which showed was detected by the enhanced automatted testbench of v4-beta.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/imudp/imudp.c3
-rw-r--r--plugins/omstdout/omstdout.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index cd250657..0970259d 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -208,6 +208,9 @@ processSocket(int fd, struct sockaddr_storage *frominetPrev, int *pbIsPermitted,
ABORT_FINALIZE(RS_RET_ERR);
}
+ if(lenRcvBuf == 0)
+ continue; /* this looks a bit strange, but practice shows it happens... */
+
/* if we reach this point, we had a good receive and can process the packet received */
/* check if we have a different sender than before, if so, we need to query some new values */
if(net.CmpHost(&frominet, frominetPrev, socklen) != 0) {
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c
index 584ae458..b3ec6287 100644
--- a/plugins/omstdout/omstdout.c
+++ b/plugins/omstdout/omstdout.c
@@ -124,7 +124,7 @@ CODESTARTdoAction
toWrite = (char*) ppString[0];
}
len = strlen(toWrite);
- write(1, toWrite, strlen(toWrite)); /* 1 is stdout! */
+ write(1, toWrite, len); /* 1 is stdout! */
if(pData->bEnsureLFEnding && toWrite[len-1] != '\n') {
write(1, "\n", 1); /* write missing LF */
}