summaryrefslogtreecommitdiffstats
path: root/plugins/mmdblookup
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 16:28:51 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-15 16:28:51 +0000
commit3f7feced8779dc78d903d3463f176042598ec24c (patch)
treeb4d0c6c0e4b20b4a65a4adda28a2be23acb6e58d /plugins/mmdblookup
parentReleasing progress-linux version 8.2402.0-1~progress7.99u1. (diff)
downloadrsyslog-3f7feced8779dc78d903d3463f176042598ec24c.tar.xz
rsyslog-3f7feced8779dc78d903d3463f176042598ec24c.zip
Merging upstream version 8.2404.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plugins/mmdblookup')
-rw-r--r--plugins/mmdblookup/mmdblookup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/mmdblookup/mmdblookup.c b/plugins/mmdblookup/mmdblookup.c
index f9f3c73..d6a26f7 100644
--- a/plugins/mmdblookup/mmdblookup.c
+++ b/plugins/mmdblookup/mmdblookup.c
@@ -412,6 +412,11 @@ CODESTARTdoAction
dbgprintf("Error from call to getaddrinfo for %s - %s\n", pszValue, gai_strerror(gai_err));
ABORT_FINALIZE(RS_RET_OK);
}
+ if (MMDB_IPV6_LOOKUP_IN_IPV4_DATABASE_ERROR == mmdb_err) {
+ LogMsg(0, NO_ERRCODE, LOG_INFO, "mmdblookup: Tried to search for an IPv6 address in an IPv4-only DB"
+ ", ignoring");
+ ABORT_FINALIZE(RS_RET_OK);
+ }
if (MMDB_SUCCESS != mmdb_err) {
dbgprintf("Got an error from the maxminddb library: %s\n", MMDB_strerror(mmdb_err));
close_mmdb(&pWrkrData->mmdb);