summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-30 11:23:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-30 11:23:41 +0200
commitd18a9df25012bb1d9170f8d39e8ebf4c62f034f6 (patch)
treeda4686d0414f983e7b6b00ac5f790080f105cd00
parent9c8f4f49b02f2d92e618e7b70a9e23a3c8d4c8aa (diff)
downloadrsyslog-d18a9df25012bb1d9170f8d39e8ebf4c62f034f6.tar.gz
rsyslog-d18a9df25012bb1d9170f8d39e8ebf4c62f034f6.tar.bz2
rsyslog-d18a9df25012bb1d9170f8d39e8ebf4c62f034f6.zip
mmanon: added "]" to set of acceptable chars after an IPv4 address
This is used in Exim and Postfix ... and probably a bunch of other tools closes: http://bugzilla.adiscon.com/show_bug.cgi?id=477 Thanks to Muri Cicanor for requesting the addition
-rw-r--r--ChangeLog4
-rw-r--r--plugins/mmanon/mmanon.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 50e5c68b..59abca28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
---------------------------------------------------------------------------
Version 7.4.5 [v7.4-stable] 2013-09-??
+- mmanon: added "]" to set of acceptable chars after an IPv4 address
+ This is used in Exim and Postfix ... and probably a bunch of other tools
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=477
+ Thanks to Muri Cicanor for requesting the addition
- bugfix: omprog blocked signals to executed programs
The made it impossible to send signals to programs executed via
omprog.
diff --git a/plugins/mmanon/mmanon.c b/plugins/mmanon/mmanon.c
index a1c99d09..5a1aa7ad 100644
--- a/plugins/mmanon/mmanon.c
+++ b/plugins/mmanon/mmanon.c
@@ -307,7 +307,7 @@ anonip(instanceData *pData, uchar *msg, int *pLenMsg, int *idx)
++i;
ipstart[3] = i;
octet = getnum(msg, lenMsg, &i);
- if(octet > 255 || !(msg[i] == ' ' || msg[i] == ':')) goto done;
+ if(octet > 255 || !(msg[i] == ' ' || msg[i] == ':' || msg[i] == ']')) goto done;
ipv4addr |= octet;
/* OK, we now found an ip address */