From: Ensar Sarajčić Date: Fri, 19 Dec 2025 12:57:06 +0000 (+0100) Subject: auth: fix geoip_mmdb backend MMDB_open error handling X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a7d9fb124fc59a2a1d51d68ceb834ced5a525fa;p=thirdparty%2Fpdns.git auth: fix geoip_mmdb backend MMDB_open error handling According to [MMDB_open docs], errors from `MMDB_open` should be compared to `MMDB_SUCCESS` (which is 0). All other errors are > 0, which means that existing check never detects errors, causing further queries to fail with error: ``` The MaxMind DB file is in a format this library can't handle (unknown record size or binary format version) ``` [MMDB_open docs]: https://maxmind.github.io/libmaxminddb/#mmdb_open Signed-off-by: Ensar Sarajčić (cherry picked from commit e1641d3872c48f4ec1ed11b775b5318322f2184a) --- diff --git a/modules/geoipbackend/geoipinterface-mmdb.cc b/modules/geoipbackend/geoipinterface-mmdb.cc index 95f1b56daf..5eb5b41d2c 100644 --- a/modules/geoipbackend/geoipinterface-mmdb.cc +++ b/modules/geoipbackend/geoipinterface-mmdb.cc @@ -46,8 +46,9 @@ public: else throw PDNSException(string("Unsupported mode ") + modeStr + ("for geoipbackend-mmdb")); memset(&d_s, 0, sizeof(d_s)); - if ((ec = MMDB_open(fname.c_str(), flags, &d_s)) < 0) + if ((ec = MMDB_open(fname.c_str(), flags, &d_s)) != MMDB_SUCCESS) { throw PDNSException(string("Cannot open ") + fname + string(": ") + string(MMDB_strerror(ec))); + } d_lang = language; g_log << Logger::Debug << "Opened MMDB database " << fname << "(type: " << d_s.metadata.database_type << " version: " << d_s.metadata.binary_format_major_version << "." << d_s.metadata.binary_format_minor_version << ")" << endl; }