]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
geoipbackend: Skip non-TXT results that format to empty
authorAki Tuomi <cmouse@cmouse.fi>
Mon, 1 Jan 2018 15:22:57 +0000 (17:22 +0200)
committerAki Tuomi <cmouse@cmouse.fi>
Wed, 14 Feb 2018 07:15:53 +0000 (09:15 +0200)
modules/geoipbackend/geoipbackend.cc

index 7e3aa2470e9a35469a53edc28055b3136878f682..724513f3a05845618d32656ce2d0c39a200ad493 100644 (file)
@@ -294,8 +294,10 @@ bool GeoIPBackend::lookup_static(const GeoIPDomain &dom, const DNSName &search,
           continue;
       }
       if (qtype == QType::ANY || rr.qtype == qtype) {
+        const string& content = format2str(rr.content, ip, v6, gl);
+        if (rr.qtype != QType::TXT && content.empty()) continue;
         d_result.push_back(rr);
-        d_result.back().content = format2str(rr.content, ip, v6, gl);
+        d_result.back().content = content;
         d_result.back().qname = qdomain;
       }
     }