From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 6 Oct 2021 11:06:17 +0000 (+0200)
Subject: Merge pull request #10780 from Habbie/remove-attodot
X-Git-Tag: auth-4.6.0-alpha1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dbebd4e113ebe58dcdad024f5380fe9ac71ab8d;p=thirdparty%2Fpdns.git

Merge pull request #10780 from Habbie/remove-attodot

auth: remove attodot feature; fixes #10254
---

8dbebd4e113ebe58dcdad024f5380fe9ac71ab8d
diff --cc pdns/pdnsutil.cc
index 879fb816d1,ea8e305536..a92b19e861
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@@ -376,9 -367,16 +376,16 @@@ static int checkZone(DNSSECKeeper &dk, 
        stringtok(parts, rr.content);
  
        if(parts.size() < 7) {
 -        cout<<"[Warning] SOA autocomplete is deprecated, missing field(s) in SOA content: "<<rr.qname<<" IN " <<rr.qtype.toString()<< " '" << rr.content<<"'"<<endl;
 +        cout << "[Info] SOA autocomplete is deprecated, missing field(s) in SOA content: " << rr.qname << " IN " << rr.qtype.toString() << " '" << rr.content << "'" << endl;
        }
  
+       if(parts.size() >= 2) {
+         if(parts[1].find('@') != string::npos) {
+           cout<<"[Warning] Found @-sign in SOA RNAME, should probably be a dot (.): "<<rr.qname<<" IN " <<rr.qtype.toString()<< " '" << rr.content<<"'"<<endl;
+           numwarnings++;
+         }
+       }
+ 
        ostringstream o;
        o<<rr.content;
        for(int pleft=parts.size(); pleft < 7; ++pleft) {