Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package pdns-recursor for openSUSE:Factory 
checked in at 2022-03-25 21:55:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pdns-recursor (Old)
 and      /work/SRC/openSUSE:Factory/.pdns-recursor.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pdns-recursor"

Fri Mar 25 21:55:03 2022 rev:51 rq:964870 version:4.6.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/pdns-recursor/pdns-recursor.changes      
2021-12-24 20:23:47.702038752 +0100
+++ /work/SRC/openSUSE:Factory/.pdns-recursor.new.1900/pdns-recursor.changes    
2022-03-25 21:55:25.866321475 +0100
@@ -1,0 +2,9 @@
+Fri Mar 25 13:21:47 UTC 2022 - Adam Majer <[email protected]>
+
+- update to 4.6.1
+  fixes incomplete validation of incoming IXFR transfer in
+  the Recursor. It applies to setups retrieving one or more RPZ
+  zones from a remote server if the network path to the server
+  is not trusted. (bsc#1197525, CVE-2022-27227)
+
+-------------------------------------------------------------------

Old:
----
  pdns-recursor-4.6.0.tar.bz2
  pdns-recursor-4.6.0.tar.bz2.sig

New:
----
  pdns-recursor-4.6.1.tar.bz2
  pdns-recursor-4.6.1.tar.bz2.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pdns-recursor.spec ++++++
--- /var/tmp/diff_new_pack.cKn5D4/_old  2022-03-25 21:55:26.450322031 +0100
+++ /var/tmp/diff_new_pack.cKn5D4/_new  2022-03-25 21:55:26.458322039 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package pdns-recursor
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@
 %endif
 
 Name:           pdns-recursor
-Version:        4.6.0
+Version:        4.6.1
 Release:        0
 BuildRequires:  autoconf
 BuildRequires:  automake

++++++ pdns-recursor-4.6.0.tar.bz2 -> pdns-recursor-4.6.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/configure 
new/pdns-recursor-4.6.1/configure
--- old/pdns-recursor-4.6.0/configure   2021-12-15 08:49:39.000000000 +0100
+++ new/pdns-recursor-4.6.1/configure   2022-03-21 09:06:06.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pdns-recursor 4.6.0.
+# Generated by GNU Autoconf 2.69 for pdns-recursor 4.6.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='pdns-recursor'
 PACKAGE_TARNAME='pdns-recursor'
-PACKAGE_VERSION='4.6.0'
-PACKAGE_STRING='pdns-recursor 4.6.0'
+PACKAGE_VERSION='4.6.1'
+PACKAGE_STRING='pdns-recursor 4.6.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1552,7 +1552,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pdns-recursor 4.6.0 to adapt to many kinds of systems.
+\`configure' configures pdns-recursor 4.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1623,7 +1623,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pdns-recursor 4.6.0:";;
+     short | recursive ) echo "Configuration of pdns-recursor 4.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1810,7 +1810,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pdns-recursor configure 4.6.0
+pdns-recursor configure 4.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2527,7 +2527,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pdns-recursor $as_me 4.6.0, which was
+It was created by pdns-recursor $as_me 4.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3395,7 +3395,7 @@
 
 # Define the identity of the package.
  PACKAGE='pdns-recursor'
- VERSION='4.6.0'
+ VERSION='4.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -28087,7 +28087,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pdns-recursor $as_me 4.6.0, which was
+This file was extended by pdns-recursor $as_me 4.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -28153,7 +28153,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pdns-recursor config.status 4.6.0
+pdns-recursor config.status 4.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/configure.ac 
new/pdns-recursor-4.6.1/configure.ac
--- old/pdns-recursor-4.6.0/configure.ac        2021-12-15 08:49:27.000000000 
+0100
+++ new/pdns-recursor-4.6.1/configure.ac        2022-03-21 09:05:54.000000000 
+0100
@@ -1,6 +1,6 @@
 AC_PREREQ([2.69])
 
-AC_INIT([pdns-recursor], [4.6.0])
+AC_INIT([pdns-recursor], [4.6.1])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability 
subdir-objects parallel-tests 1.11])
 AM_SILENT_RULES([yes])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/effective_tld_names.dat 
new/pdns-recursor-4.6.1/effective_tld_names.dat
--- old/pdns-recursor-4.6.0/effective_tld_names.dat     2021-12-15 
08:51:14.000000000 +0100
+++ new/pdns-recursor-4.6.1/effective_tld_names.dat     2022-03-21 
09:07:30.000000000 +0100
@@ -9,7 +9,7 @@
 
 // ===BEGIN ICANN DOMAINS===
 
-// ac : https://en.wikipedia.org/wiki/.ac
+// ac : http://nic.ac/rules.htm
 ac
 com.ac
 edu.ac
@@ -865,6 +865,7 @@
 
 // cy : http://www.nic.cy/
 // Submitted by registry Panayiotou Fotia <[email protected]>
+// namespace policies URL 
https://www.nic.cy/portal//sites/default/files/symfonia_gia_eggrafi.pdf
 cy
 ac.cy
 biz.cy
@@ -872,10 +873,9 @@
 ekloges.cy
 gov.cy
 ltd.cy
-name.cy
+mil.cy
 net.cy
 org.cy
-parliament.cy
 press.cy
 pro.cy
 tm.cy
@@ -1366,7 +1366,7 @@
 int
 eu.int
 
-// io : http://www.nic.io/rules.html
+// io : http://www.nic.io/rules.htm
 // list of other 2nd level tlds ?
 io
 com.io
@@ -3765,11 +3765,10 @@
 // ky : http://www.icta.ky/da_ky_reg_dom.php
 // Confirmed by registry <[email protected]> 2008-06-17
 ky
-edu.ky
-gov.ky
 com.ky
-org.ky
+edu.ky
 net.ky
+org.ky
 
 // kz : https://en.wikipedia.org/wiki/.kz
 // see also: http://www.nic.kz/rules/index.jsp
@@ -6037,7 +6036,7 @@
 edu.sg
 per.sg
 
-// sh : http://www.nic.sh/registrar.html
+// sh : http://nic.sh/rules.htm
 sh
 com.sh
 net.sh
@@ -7132,7 +7131,7 @@
 
 // newGTLDs
 
-// List of new gTLDs imported from 
https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 
2021-12-04T15:13:28Z
+// List of new gTLDs imported from 
https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 
2022-02-18T15:13:38Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7527,7 +7526,7 @@
 // bostik : 2015-05-28 Bostik SA
 bostik
 
-// boston : 2015-12-10 Boston TLD Management, LLC
+// boston : 2015-12-10 Registry Services, LLC
 boston
 
 // bot : 2014-12-18 Amazon Registry Services, Inc.
@@ -7557,9 +7556,6 @@
 // brussels : 2014-02-06 DNS.be vzw
 brussels
 
-// budapest : 2013-11-21 Minds + Machines Group Limited
-budapest
-
 // bugatti : 2015-07-23 Bugatti International SA
 bugatti
 
@@ -7596,7 +7592,7 @@
 // calvinklein : 2015-07-30 PVH gTLD Holdings LLC
 calvinklein
 
-// cam : 2016-04-21 AC Webconnecting Holding B.V.
+// cam : 2016-04-21 Cam Connecting SARL
 cam
 
 // camera : 2013-08-27 Binky Moon, LLC
@@ -7869,9 +7865,6 @@
 // cruises : 2013-12-05 Binky Moon, LLC
 cruises
 
-// csc : 2014-09-25 Alliance-One Services, Inc.
-csc
-
 // cuisinella : 2014-04-03 SCHMIDT GROUPE S.A.S.
 cuisinella
 
@@ -8871,9 +8864,6 @@
 // living : 2015-07-30 Lifestyle Domain Holdings, Inc.
 living
 
-// lixil : 2015-03-19 LIXIL Group Corporation
-lixil
-
 // llc : 2017-12-14 Afilias Limited
 llc
 
@@ -9012,7 +9002,7 @@
 // merckmsd : 2016-07-14 MSD Registry Holdings, Inc.
 merckmsd
 
-// miami : 2013-12-19 Minds + Machines Group Limited
+// miami : 2013-12-19 Registry Services, LLC
 miami
 
 // microsoft : 2014-12-18 Microsoft Corporation
@@ -10643,6 +10633,10 @@
 // Submitted by Przemyslaw Plewa <[email protected]>
 beep.pl
 
+// Aiven: https://aiven.io/
+// Submitted by Etienne Stalmans <[email protected]>
+aivencloud.com
+
 // alboto.ca : http://alboto.ca
 // Submitted by Anton Avramov <[email protected]>
 barsy.ca
@@ -10815,6 +10809,10 @@
 // Submitted by Sam Smyth <[email protected]>
 cdn.prod.atlassian-dev.net
 
+// Authentick UG (haftungsbeschr??nkt) : https://authentick.net
+// Submitted by Lukas Reschke <[email protected]>
+translated.page
+
 // AVM : https://avm.de
 // Submitted by Andreas Weise <[email protected]>
 myfritz.net
@@ -10829,7 +10827,7 @@
 *.advisor.ws
 
 // AZ.pl sp. z.o.o: https://az.pl
-// Submited by Krzysztof Wolski <[email protected]>
+// Submitted by Krzysztof Wolski <[email protected]>
 ecommerce-shop.pl
 
 // b-data GmbH : https://www.b-data.io
@@ -10868,6 +10866,10 @@
 shopselect.net
 base.shop
 
+// Beget Ltd
+// Submitted by Lev Nekrasov <[email protected]>
+*.beget.app
+
 // BetaInABox
 // Submitted by Adrian <[email protected]>
 betainabox.com
@@ -11109,6 +11111,10 @@
 // Submitted by Angelo Gladding <[email protected]>
 cnpy.gdn
 
+// Codeberg e. V. : https://codeberg.org
+// Submitted by Moritz Marquardt <[email protected]>
+codeberg.page
+
 // CoDNS B.V.
 co.nl
 co.no
@@ -11235,11 +11241,21 @@
 // Submitted by Peter Thomassen <[email protected]>
 dedyn.io
 
+// Deta: https://www.deta.sh/
+// Submitted by Aavash Shrestha <[email protected]>
+deta.app
+deta.dev
+
 // Diher Solutions : https://diher.solutions
 // Submitted by Didi Hermawan <[email protected]>
 *.rss.my.id
 *.diher.solutions
 
+// Discord Inc : https://discord.com
+// Submitted by Sahn Lam <[email protected]>
+discordsays.com
+discordsez.com
+
 // DNS Africa Ltd https://dns.business
 // Submitted by Calvin Browne <[email protected]>
 jozi.biz
@@ -11859,8 +11875,6 @@
 
 // FearWorks Media Ltd. : https://fearworksmedia.co.uk
 // submitted by Keith Fairley <[email protected]>
-couk.me
-ukco.me
 conn.uk
 copro.uk
 hosp.uk
@@ -11964,10 +11978,21 @@
 *.kunden.ortsinfo.at
 *.statics.cloud
 
-// GDS : 
https://www.gov.uk/service-manual/operations/operating-servicegovuk-subdomains
-// Submitted by David Illsley <[email protected]>
+// GDS : https://www.gov.uk/service-manual/technology/managing-domain-names
+// Submitted by Stephen Ford <[email protected]>
+independent-commission.uk
+independent-inquest.uk
+independent-inquiry.uk
+independent-panel.uk
+independent-review.uk
+public-inquiry.uk
+royal-commission.uk
 service.gov.uk
 
+// CDDO : https://www.gov.uk/guidance/get-an-api-domain-on-govuk
+// Submitted by Jamie Tanna <[email protected]>
+api.gov.uk
+
 // Gehirn Inc. : https://www.gehirn.co.jp/
 // Submitted by Kohei YOSHIDA <[email protected]>
 gehirn.ne.jp
@@ -12017,8 +12042,113 @@
 shop.ro
 
 // GMO Pepabo, Inc. : https://pepabo.com/
-// Submitted by dojineko <[email protected]>
+// Submitted by Hosting Div <[email protected]>
 lolipop.io
+angry.jp
+babyblue.jp
+babymilk.jp
+backdrop.jp
+bambina.jp
+bitter.jp
+blush.jp
+boo.jp
+boy.jp
+boyfriend.jp
+but.jp
+candypop.jp
+capoo.jp
+catfood.jp
+cheap.jp
+chicappa.jp
+chillout.jp
+chips.jp
+chowder.jp
+chu.jp
+ciao.jp
+cocotte.jp
+coolblog.jp
+cranky.jp
+cutegirl.jp
+daa.jp
+deca.jp
+deci.jp
+digick.jp
+egoism.jp
+fakefur.jp
+fem.jp
+flier.jp
+floppy.jp
+fool.jp
+frenchkiss.jp
+girlfriend.jp
+girly.jp
+gloomy.jp
+gonna.jp
+greater.jp
+hacca.jp
+heavy.jp
+her.jp
+hiho.jp
+hippy.jp
+holy.jp
+hungry.jp
+icurus.jp
+itigo.jp
+jellybean.jp
+kikirara.jp
+kill.jp
+kilo.jp
+kuron.jp
+littlestar.jp
+lolitapunk.jp
+lomo.jp
+lovepop.jp
+lovesick.jp
+main.jp
+mods.jp
+mond.jp
+mongolian.jp
+moo.jp
+namaste.jp
+nikita.jp
+nobushi.jp
+noor.jp
+oops.jp
+parallel.jp
+parasite.jp
+pecori.jp
+peewee.jp
+penne.jp
+pepper.jp
+perma.jp
+pigboat.jp
+pinoko.jp
+punyu.jp
+pupu.jp
+pussycat.jp
+pya.jp
+raindrop.jp
+readymade.jp
+sadist.jp
+schoolbus.jp
+secret.jp
+staba.jp
+stripper.jp
+sub.jp
+sunnyday.jp
+thick.jp
+tonkotsu.jp
+under.jp
+upper.jp
+velvet.jp
+verse.jp
+versus.jp
+vivian.jp
+watson.jp
+weblike.jp
+whitesnow.jp
+zombie.jp
+heteml.net
 
 // GOV.UK Platform as a Service : https://www.cloud.service.gov.uk/
 // Submitted by Tom Whitwell 
<[email protected]>
@@ -12150,7 +12280,7 @@
 g??nstigliefern.de
 
 // Hakaran group: http://hakaran.cz
-// Submited by Arseniy Sokolov <[email protected]>
+// Submitted by Arseniy Sokolov <[email protected]>
 fin.ci
 free.hr
 caa.li
@@ -12193,7 +12323,7 @@
 ravendb.run
 
 // home.pl S.A.: https://home.pl
-// Submited by Krzysztof Wolski <[email protected]>
+// Submitted by Krzysztof Wolski <[email protected]>
 homesklep.pl
 
 // Hong Kong Productivity Council: https://www.hkpc.org/
@@ -12303,7 +12433,7 @@
 pixolino.com
 
 // Internet-Pro, LLP: https://netangels.ru/
-// Submited by Vasiliy Sheredeko <[email protected]>
+// Submitted by Vasiliy Sheredeko <[email protected]>
 na4u.ru
 
 // iopsys software solutions AB : https://iopsys.eu/
@@ -12326,7 +12456,7 @@
 iobb.net
 
 // Jelastic, Inc. : https://jelastic.com/
-// Submited by Ihor Kolodyuk <[email protected]>
+// Submitted by Ihor Kolodyuk <[email protected]>
 mel.cloudlets.com.au
 cloud.interhostsolutions.be
 users.scale.virtualcloud.com.br
@@ -12437,6 +12567,14 @@
 kaas.gg
 khplay.nl
 
+// Kakao : https://www.kakaocorp.com/
+// Submitted by JaeYoong Lee <[email protected]>
+ktistory.com
+
+// Kapsi : https://kapsi.fi
+// Submitted by Tomi Juntunen <[email protected]>
+kapsi.fi
+
 // Keyweb AG : https://www.keyweb.de
 // Submitted by Martin Dannehl <[email protected]>
 keymachine.de
@@ -12754,7 +12892,10 @@
 // Northflank Ltd. : https://northflank.com/
 // Submitted by Marco Suter <[email protected]>
 *.northflank.app
+*.build.run
 *.code.run
+*.database.run
+*.migration.run
 
 // Noticeable : https://noticeable.io
 // Submitted by Laurent Pellegrino <[email protected]>
@@ -12937,8 +13078,12 @@
 // Submitted by Yngve Pettersen <[email protected]>
 operaunite.com
 
+// Orange : https://www.orange.com
+// Submitted by Alexandre Linte <[email protected]>
+tech.orange
+
 // Oursky Limited : https://authgear.com/, https://skygear.io/
-// Submited by Authgear Team <[email protected]>, Skygear Developer 
<[email protected]>
+// Submitted by Authgear Team <[email protected]>, Skygear Developer 
<[email protected]>
 authgear-staging.com
 authgearapps.com
 skygearapp.com
@@ -13046,6 +13191,10 @@
 // Submitted by Maximilian Schieder <[email protected]>
 dyn53.io
 
+// Porter : https://porter.run/
+// Submitted by Rudraksh MK <[email protected]>
+onporter.run
+
 // Positive Codes Technology Company : http://co.bn/faq.html
 // Submitted by Zulfais <[email protected]>
 co.bn
@@ -13207,6 +13356,10 @@
 // Submitted by Jennifer Herting <[email protected]>
 git-pages.rit.edu
 
+// Rocky Enterprise Software Foundation : https://resf.org
+// Submitted by Neil Hanlon <[email protected]>
+rocky.page
+
 // Rusnames Limited: http://rusnames.ru/
 // Submitted by Sergey Zotov <[email protected]>
 ??????.??????
@@ -13349,6 +13502,8 @@
 stackhero-network.com
 
 // Staclar : https://staclar.com
+// Submitted by Q Misell <[email protected]>
+musician.io
 // Submitted by Matthias Merkel <[email protected]>
 novecore.site
 
@@ -13483,6 +13638,10 @@
 med.pl
 sopot.pl
 
+// team.blue https://team.blue
+// Submitted by Cedric Dubois <[email protected]>
+site.tb-hosting.com
+
 // Teckids e.V. : https://www.teckids.org
 // Submitted by Dominik George <[email protected]>
 edugit.io
@@ -13564,6 +13723,10 @@
 *.transurl.eu
 *.transurl.nl
 
+// TransIP: https://www.transip.nl
+// Submitted by Cedric Dubois <[email protected]>
+site.transip.me
+
 // TuxFamily : http://tuxfamily.org
 // Submitted by TuxFamily administrators <[email protected]>
 tuxfamily.org
@@ -13584,6 +13747,10 @@
 synology-diskstation.de
 synology-ds.de
 
+// Typedream : https://typedream.com
+// Submitted by Putri Karunia <[email protected]>
+typedream.app
+
 // Typeform : https://www.typeform.com
 // Submitted by Sergi Ferriz <[email protected]>
 pro.typeform.com
@@ -13686,19 +13853,14 @@
 // Submitted by Serhii Rostilo <[email protected]>
 v.ua
 
+// Vultr Objects : https://www.vultr.com/products/object-storage/
+// Submitted by Niels Maumenee <[email protected]>
+*.vultrobjects.com
+
 // Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com
 // Submitted by Masayuki Note <[email protected]>
 wafflecell.com
 
-// WapBlog.ID : https://www.wapblog.id
-// Submitted by Fajar Sodik <[email protected]>
-idnblogger.com
-indowapblog.com
-bloger.id
-wblog.id
-wbq.me
-fastblog.net
-
 // WebHare bv: https://www.webhare.com/
 // Submitted by Arnold Hendriks <[email protected]>
 *.webhare.dev
@@ -13735,6 +13897,10 @@
 panel.gg
 daemon.panel.gg
 
+// Wizard Zines : https://wizardzines.com
+// Submitted by Julia Evans <[email protected]>
+messwithdns.com
+
 // WoltLab GmbH : https://www.woltlab.com
 // Submitted by Tim D??sterhus <[email protected]>
 woltlab-demo.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/ixfr.cc 
new/pdns-recursor-4.6.1/ixfr.cc
--- old/pdns-recursor-4.6.0/ixfr.cc     2021-11-23 19:39:17.000000000 +0100
+++ new/pdns-recursor-4.6.1/ixfr.cc     2022-03-21 09:05:17.000000000 +0100
@@ -174,13 +174,21 @@
   std::shared_ptr<SOARecordContent> primarySOA = nullptr;
   vector<DNSRecord> records;
   size_t receivedBytes = 0;
-  int8_t ixfrInProgress = -2;
   std::string reply;
 
+  enum transferStyle { Unknown, AXFR, IXFR } style = Unknown;
+  const unsigned int expectedSOAForAXFR = 2;
+  const unsigned int expectedSOAForIXFR = 3;
+  unsigned int primarySOACount = 0;
+
   for(;;) {
-    // IXFR end
-    if (ixfrInProgress >= 0)
+    // IXFR or AXFR style end reached? We don't want to process trailing data 
after the closing SOA
+    if (style == AXFR && primarySOACount == expectedSOAForAXFR) {
+      break;
+    }
+    else if (style == IXFR && primarySOACount == expectedSOAForIXFR) {
       break;
+    }
 
     if(s.read((char*)&len, sizeof(len)) != sizeof(len))
       break;
@@ -225,16 +233,31 @@
           return ret;
         }
         primarySOA = sr;
+        ++primarySOACount;
       } else if (r.first.d_type == QType::SOA) {
         auto sr = getRR<SOARecordContent>(r.first);
         if (!sr) {
           throw std::runtime_error("Error getting the content of SOA record of 
IXFR answer for zone '"+zone.toLogString()+"' from primary 
'"+primary.toStringWithPort()+"'");
         }
 
-        // we hit the last SOA record
-        // IXFR is considered to be done if we hit the last SOA record twice
+        // we hit a marker SOA record
         if (primarySOA->d_st.serial == sr->d_st.serial) {
-          ixfrInProgress++;
+          ++primarySOACount;
+        }
+      }
+      // When we see the 2nd record, we can decide what the style is
+      if (records.size() == 1 && style == Unknown) {
+        if (r.first.d_type != QType::SOA) {
+          // Non-empty AXFR style has a non-SOA record following the first SOA
+          style = AXFR;
+        }
+        else if (primarySOACount == expectedSOAForAXFR) {
+          // Empty zone AXFR style: start SOA is immediately followed by end 
marker SOA
+          style = AXFR;
+        }
+        else {
+          // IXFR has a 2nd SOA (with different serial) following the first
+          style = IXFR;
         }
       }
 
@@ -253,7 +276,21 @@
     }
   }
 
-  //  cout<<"Got "<<records.size()<<" records"<<endl;
+  switch (style) {
+  case IXFR:
+    if (primarySOACount != expectedSOAForIXFR) {
+      throw std::runtime_error("Incomplete IXFR transfer for '" + 
zone.toLogString() + "' from primary '" + primary.toStringWithPort());
+    }
+    break;
+  case AXFR:
+    if (primarySOACount != expectedSOAForAXFR){
+      throw std::runtime_error("Incomplete AXFR style transfer for '" + 
zone.toLogString() + "' from primary '" + primary.toStringWithPort());
+    }
+    break;
+  case Unknown:
+    throw std::runtime_error("Incomplete XFR for '" + zone.toLogString() + "' 
from primary '" + primary.toStringWithPort());
+    break;
+  }
 
   return processIXFRRecords(primary, zone, records, primarySOA);
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/pdns_recursor.1 
new/pdns-recursor-4.6.1/pdns_recursor.1
--- old/pdns-recursor-4.6.0/pdns_recursor.1     2021-12-15 08:51:13.000000000 
+0100
+++ new/pdns-recursor-4.6.1/pdns_recursor.1     2022-03-21 09:07:29.000000000 
+0100
@@ -27,7 +27,7 @@
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "PDNS_RECURSOR" "1" "Dec 15, 2021" "" "PowerDNS Recursor"
+.TH "PDNS_RECURSOR" "1" "Mar 21, 2022" "" "PowerDNS Recursor"
 .SH NAME
 pdns_recursor \- The PowerDNS Recursor binary
 .SH SYNOPSIS
@@ -194,6 +194,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2001-2021, PowerDNS.COM BV
+2001-2022, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/pubsuffix.cc 
new/pdns-recursor-4.6.1/pubsuffix.cc
--- old/pdns-recursor-4.6.0/pubsuffix.cc        2021-12-15 08:51:14.000000000 
+0100
+++ new/pdns-recursor-4.6.1/pubsuffix.cc        2022-03-21 09:07:30.000000000 
+0100
@@ -629,10 +629,9 @@
 "ekloges.cy",
 "gov.cy",
 "ltd.cy",
-"name.cy",
+"mil.cy",
 "net.cy",
 "org.cy",
-"parliament.cy",
 "press.cy",
 "pro.cy",
 "tm.cy",
@@ -3145,11 +3144,10 @@
 "ind.kw",
 "net.kw",
 "org.kw",
-"edu.ky",
-"gov.ky",
 "com.ky",
-"org.ky",
+"edu.ky",
 "net.ky",
+"org.ky",
 "org.kz",
 "edu.kz",
 "net.kz",
@@ -5548,6 +5546,7 @@
 "hlx.page",
 "hlx3.page",
 "beep.pl",
+"aivencloud.com",
 "barsy.ca",
 "kasserver.com",
 "altervista.org",
@@ -5647,6 +5646,7 @@
 "sweetpepper.org",
 "myasustor.com",
 "cdn.prod.atlassian-dev.net",
+"translated.page",
 "myfritz.net",
 "onavstack.net",
 "ecommerce-shop.pl",
@@ -5770,6 +5770,7 @@
 "cloudns.pw",
 "cloudns.us",
 "cnpy.gdn",
+"codeberg.page",
 "co.nl",
 "co.no",
 "webhosting.be",
@@ -5820,6 +5821,10 @@
 "deno.dev",
 "deno-staging.dev",
 "dedyn.io",
+"deta.app",
+"deta.dev",
+"discordsays.com",
+"discordsez.com",
 "jozi.biz",
 "dnshome.de",
 "online.th",
@@ -6323,8 +6328,6 @@
 "cloud.fedoraproject.org",
 "app.os.fedoraproject.org",
 "app.os.stg.fedoraproject.org",
-"couk.me",
-"ukco.me",
 "conn.uk",
 "copro.uk",
 "hosp.uk",
@@ -6363,7 +6366,15 @@
 "wien.funkfeuer.at",
 "futurehosting.at",
 "futuremailing.at",
+"independent-commission.uk",
+"independent-inquest.uk",
+"independent-inquiry.uk",
+"independent-panel.uk",
+"independent-review.uk",
+"public-inquiry.uk",
+"royal-commission.uk",
 "service.gov.uk",
+"api.gov.uk",
 "gehirn.ne.jp",
 "usercontent.jp",
 "gentapps.com",
@@ -6383,6 +6394,111 @@
 "co.ro",
 "shop.ro",
 "lolipop.io",
+"angry.jp",
+"babyblue.jp",
+"babymilk.jp",
+"backdrop.jp",
+"bambina.jp",
+"bitter.jp",
+"blush.jp",
+"boo.jp",
+"boy.jp",
+"boyfriend.jp",
+"but.jp",
+"candypop.jp",
+"capoo.jp",
+"catfood.jp",
+"cheap.jp",
+"chicappa.jp",
+"chillout.jp",
+"chips.jp",
+"chowder.jp",
+"chu.jp",
+"ciao.jp",
+"cocotte.jp",
+"coolblog.jp",
+"cranky.jp",
+"cutegirl.jp",
+"daa.jp",
+"deca.jp",
+"deci.jp",
+"digick.jp",
+"egoism.jp",
+"fakefur.jp",
+"fem.jp",
+"flier.jp",
+"floppy.jp",
+"fool.jp",
+"frenchkiss.jp",
+"girlfriend.jp",
+"girly.jp",
+"gloomy.jp",
+"gonna.jp",
+"greater.jp",
+"hacca.jp",
+"heavy.jp",
+"her.jp",
+"hiho.jp",
+"hippy.jp",
+"holy.jp",
+"hungry.jp",
+"icurus.jp",
+"itigo.jp",
+"jellybean.jp",
+"kikirara.jp",
+"kill.jp",
+"kilo.jp",
+"kuron.jp",
+"littlestar.jp",
+"lolitapunk.jp",
+"lomo.jp",
+"lovepop.jp",
+"lovesick.jp",
+"main.jp",
+"mods.jp",
+"mond.jp",
+"mongolian.jp",
+"moo.jp",
+"namaste.jp",
+"nikita.jp",
+"nobushi.jp",
+"noor.jp",
+"oops.jp",
+"parallel.jp",
+"parasite.jp",
+"pecori.jp",
+"peewee.jp",
+"penne.jp",
+"pepper.jp",
+"perma.jp",
+"pigboat.jp",
+"pinoko.jp",
+"punyu.jp",
+"pupu.jp",
+"pussycat.jp",
+"pya.jp",
+"raindrop.jp",
+"readymade.jp",
+"sadist.jp",
+"schoolbus.jp",
+"secret.jp",
+"staba.jp",
+"stripper.jp",
+"sub.jp",
+"sunnyday.jp",
+"thick.jp",
+"tonkotsu.jp",
+"under.jp",
+"upper.jp",
+"velvet.jp",
+"verse.jp",
+"versus.jp",
+"vivian.jp",
+"watson.jp",
+"weblike.jp",
+"whitesnow.jp",
+"zombie.jp",
+"heteml.net",
 "cloudapps.digital",
 "london.cloudapps.digital",
 "pymnt.uk",
@@ -6659,6 +6775,8 @@
 "js.org",
 "kaas.gg",
 "khplay.nl",
+"ktistory.com",
+"kapsi.fi",
 "keymachine.de",
 "kinghost.net",
 "uni5.net",
@@ -6934,6 +7052,7 @@
 "opencraft.hosting",
 "orsites.com",
 "operaunite.com",
+"tech.orange",
 "authgear-staging.com",
 "authgearapps.com",
 "skygearapp.com",
@@ -6972,6 +7091,7 @@
 "plesk.page",
 "pleskns.com",
 "dyn53.io",
+"onporter.run",
 "co.bn",
 "postman-echo.com",
 "pstmn.io",
@@ -7019,6 +7139,7 @@
 "adimo.co.uk",
 "itcouldbewor.se",
 "git-pages.rit.edu",
+"rocky.page",
 "sandcats.io",
 "logoip.de",
 "logoip.com",
@@ -7066,6 +7187,7 @@
 "try-snowplow.com",
 "srht.site",
 "stackhero-network.com",
+"musician.io",
 "novecore.site",
 "static.land",
 "dev.static.land",
@@ -7133,6 +7255,7 @@
 "gdynia.pl",
 "med.pl",
 "sopot.pl",
+"site.tb-hosting.com",
 "edugit.io",
 "s3.teckids.org",
 "telebit.app",
@@ -7175,6 +7298,7 @@
 "lima-city.rocks",
 "webspace.rocks",
 "lima.zone",
+"site.transip.me",
 "tuxfamily.org",
 "dd-dns.de",
 "diskstation.eu",
@@ -7189,6 +7313,7 @@
 "syno-ds.de",
 "synology-diskstation.de",
 "synology-ds.de",
+"typedream.app",
 "pro.typeform.com",
 "uber.space",
 "hk.com",
@@ -7249,12 +7374,6 @@
 "me.vu",
 "v.ua",
 "wafflecell.com",
-"idnblogger.com",
-"indowapblog.com",
-"bloger.id",
-"wblog.id",
-"wbq.me",
-"fastblog.net",
 "reserve-online.net",
 "reserve-online.com",
 "bookonline.app",
@@ -7269,6 +7388,7 @@
 "wmcloud.org",
 "panel.gg",
 "daemon.panel.gg",
+"messwithdns.com",
 "woltlab-demo.com",
 "myforum.community",
 "community-pro.de",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pdns-recursor-4.6.0/rec_control.1 
new/pdns-recursor-4.6.1/rec_control.1
--- old/pdns-recursor-4.6.0/rec_control.1       2021-12-15 08:51:13.000000000 
+0100
+++ new/pdns-recursor-4.6.1/rec_control.1       2022-03-21 09:07:29.000000000 
+0100
@@ -27,7 +27,7 @@
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "REC_CONTROL" "1" "Dec 15, 2021" "" "PowerDNS Recursor"
+.TH "REC_CONTROL" "1" "Mar 21, 2022" "" "PowerDNS Recursor"
 .SH NAME
 rec_control \- Command line tool to control a running Recursor
 .SH SYNOPSIS
@@ -381,6 +381,6 @@
 .SH AUTHOR
 PowerDNS.COM BV
 .SH COPYRIGHT
-2001-2021, PowerDNS.COM BV
+2001-2022, PowerDNS.COM BV
 .\" Generated by docutils manpage writer.
 .

Reply via email to