From: Ruben d'Arco Date: Fri, 15 Feb 2013 14:11:50 +0000 (+0100) Subject: disable-rfc2136 -> experimental-rfc2136 X-Git-Tag: rec-3.6.0-rc1~556^2~3^2~76 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=629e61032d8ce2c9b38517f7d7adcaf5088cea43;p=thirdparty%2Fpdns.git disable-rfc2136 -> experimental-rfc2136 --- diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc old mode 100644 new mode 100755 index c24746a392..ec4278c099 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -39,7 +39,7 @@ ArgvMap &arg() void declareArguments() { ::arg().set("local-port","The port on which we listen")="53"; - ::arg().setSwitch("disable-rfc2136","Enable/Disable RFC2136 (Dynamic DNS) support. Default is no.")="yes"; + ::arg().setSwitch("experimental-rfc2136","Enable/Disable RFC2136 (Dynamic DNS) support. Default is no.")="no"; ::arg().setSwitch("allow-2136-from","A global setting to allow RFC2136 from these IP ranges.")="0.0.0.0/0"; ::arg().setSwitch("log-dns-details","If PDNS should log DNS non-erroneous details")=""; ::arg().setSwitch("log-dns-queries","If PDNS should log all incoming DNS queries")="no"; diff --git a/pdns/docs/pdns.xml b/pdns/docs/pdns.xml old mode 100644 new mode 100755 index 2ae70be770..c1a1c4777f --- a/pdns/docs/pdns.xml +++ b/pdns/docs/pdns.xml @@ -13181,11 +13181,11 @@ sql> insert into domainmetadata (domain_id, kind, content) values (7,'ALLOW-AXFR There are two configuration parameters that can be used within the powerdns configuration file. - disable-rfc2136 [=yes] + experimental-rfc2136 [=no] - A setting to enable/disable RFC2136 support completely. The default is yes, which means that RFC2136 updates are ignored by PowerDNS (no message is logged about this!). - Change the setting to disable-rfc2136=no to enable RFC2136 support. + A setting to enable/disable RFC2136 support completely. The default is no, which means that RFC2136 updates are ignored by PowerDNS (no message is logged about this!). + Change the setting to experimental-rfc2136=yes to enable RFC2136 support. @@ -13408,12 +13408,12 @@ zone 1.168.192.in-addr.arpa. { Enabled RFC2136 (dynamic update) support functionality in PowerDNS by adding the following to the PowerDNS configuration file (pdns.conf). -disable-rfc2136=no +experimental-rfc2136=yes allow-2136-from= This tells PowerDNS to: - Enable RFC2136 support(disable-rfc21356) + Enable RFC2136 support(experimental-rfc21356) Allow updates from NO ip-address (allow-2136-from=) @@ -13459,7 +13459,7 @@ sql> insert into domainmetadata (domain_id, kind, content) values (6, 'TSIG-ALLO If it is not valid, Refused is returned to the requestor. A check is performed on the zone to see if it is a valid zone. ServFail is returned when not valid. - The disable-rfc2136 setting is checked. Refused is returned when the setting is 'yes'. + The experimental-rfc2136 setting is checked. Refused is returned when the setting is 'no'. If the ALLOW-2136-FROM has a value (from both domainmetadata and the configuration file), a check on the value is performed. If the requestor (sender of the update message) does not match the values in ALLOW-2136-FROM, Refused is returned. @@ -22274,7 +22274,7 @@ select content,ttl,prio,type,domain_id,name from records where (name='%s' OR nam This method should remove all the records with qname of type qt. qt might also be ANY, which means all the records with that qname need to be removed. - After removal, the records in rrset must be added to the zone. rrset might be empty. + After removal, the records in rrset must be added to the zone. rrset can be empty in which case the method is used to remove a RRset. diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc index e9434ecb80..c1fd0554c2 100755 --- a/pdns/rfc2136handler.cc +++ b/pdns/rfc2136handler.cc @@ -340,7 +340,7 @@ uint16_t PacketHandler::performUpdate(const string &msgPrefix, const DNSRecord * } int PacketHandler::processUpdate(DNSPacket *p) { - if (::arg().mustDo("disable-rfc2136")) + if (! ::arg().mustDo("experimental-rfc2136")) return RCode::Refused; string msgPrefix="UPDATE from " + p->getRemote() + " for " + p->qdomain + ": "; diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 0859eb002d..66ab2dd79c 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -122,7 +122,7 @@ case $context in $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=bind --bind-config=./named.conf \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config & skipreasons="nodnssec nodyndns" bindwait @@ -164,7 +164,7 @@ case $context in --no-shuffle --launch=bind --bind-config=./named.conf \ --bind-dnssec-db=./dnssec.sqlite3 \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config & bindwait ;; @@ -200,7 +200,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gmysql \ --master --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gmysql-dbname="$GMYSQLDB" \ --gmysql-user="$GMYSQLUSER" \ @@ -286,7 +286,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=random,gmysql --gmysql-dnssec \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gmysql-dbname="$GMYSQLDB" \ --gmysql-user="$GMYSQLUSER" \ @@ -339,7 +339,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gpgsql --gpgsql-dnssec \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gpgsql-dbname="$GPGSQLDB" \ --gpgsql-user="$GPGSQLUSER" & @@ -381,7 +381,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gpgsql \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gpgsql-dbname="$GPGSQLDB" \ --gpgsql-user="$GPGSQLUSER" & @@ -407,7 +407,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gsqlite3 \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gsqlite3-database=pdns.sqlite3 & skipreasons=nodnssec @@ -455,7 +455,7 @@ __EOF__ $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config \ --gsqlite3-database=pdns.sqlite3 & if [ $context = gsqlite3-nsec3 ] @@ -473,7 +473,7 @@ __EOF__ --no-shuffle --launch=tinydns \ --cache-ttl=$cachettl --no-config \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --tinydns-dbfile=../modules/tinydnsbackend/data.cdb & skipreasons="nodnssec noent nodyndns" ;; @@ -547,7 +547,7 @@ EOF --no-shuffle --launch=remote \ --query-logging --loglevel=9 --cache-ttl=$cachettl --no-config \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --remote-connection-string="$connstr" $remote_add_param & echo "Setting up test database..." @@ -623,7 +623,7 @@ then $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=gmysql --gmysql-dnssec \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --query-cache-ttl=$cachettl --no-config --slave --retrieval-threads=1 \ --gmysql-dbname="$GMYSQL2DB" \ --gmysql-user="$GMYSQL2USER" \ @@ -691,7 +691,7 @@ then $RUNWRAPPER $PDNS2 --daemon=no --local-port=$port --socket-dir=./ \ --no-shuffle --launch=bind --bind-config=./named-slave.conf --slave \ --send-root-referral --retrieval-threads=1 --config-name=bind-slave \ - --allow-2136-from=127.0.0.0/8 --disable-rfc2136=no \ + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ --cache-ttl=$cachettl --no-config --bind-dnssec-db=./dnssec-slave.sqlite3 & echo 'waiting for zones to be loaded' bindwait bind-slave