disable-rfc2136 -> experimental-rfc2136

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
old mode 100644 (file)
new mode 100755 (executable)
index c24746a..ec4278c
--- 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 (file)
new mode 100755 (executable)
index 2ae70be..c1a1c47
--- 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
       <para>There are two configuration parameters that can be used within the powerdns configuration file.</para>
       <variablelist>
         <varlistentry>
-          <term>disable-rfc2136 [=yes]</term>
+          <term>experimental-rfc2136 [=no]</term>
           <listitem>
             <para>
-              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 <command>disable-rfc2136=no</command> 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 <command>experimental-rfc2136=yes</command> to enable RFC2136 support.
             </para>
           </listitem>
         </varlistentry>
@@ -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).
 <programlisting>
-disable-rfc2136=no
+experimental-rfc2136=yes
 allow-2136-from=
 </programlisting>
          This tells PowerDNS to:
          <orderedlist>
-           <listitem><para>Enable RFC2136 support(<command>disable-rfc21356</command>)</para></listitem>
+           <listitem><para>Enable RFC2136 support(<command>experimental-rfc21356</command>)</para></listitem>
            <listitem><para>Allow updates from NO ip-address (<command>allow-2136-from=</command>)</para></listitem>
          </orderedlist>
         </para>
@@ -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.
           </para></listitem>
           <listitem><para>A check is performed on the zone to see if it is a valid zone. ServFail is returned when not valid.</para></listitem>
-          <listitem><para>The <command>disable-rfc2136</command> setting is checked. Refused is returned when the setting is 'yes'.</para></listitem>
+          <listitem><para>The <command>experimental-rfc2136</command> setting is checked. Refused is returned when the setting is 'no'.</para></listitem>
           <listitem><para>
             If the <command>ALLOW-2136-FROM</command> 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 <command>ALLOW-2136-FROM</command>, Refused is returned.
@@ -22274,7 +22274,7 @@ select content,ttl,prio,type,domain_id,name from records where (name='%s' OR nam
              <para>
                This method should remove all the records with <function>qname</function> of type <function>qt</function>. <function>qt</function> 
                might also be ANY, which means all the records with that <function>qname</function> need to be removed.
-               After removal, the records in <function>rrset</function> must be added to the zone. <function>rrset</function> might be empty.
+               After removal, the records in <function>rrset</function> must be added to the zone. <function>rrset</function> can be empty in which case the method is used to remove a RRset.
           </para>
            </listitem>
          </varlistentry>

diff --git a/pdns/rfc2136handler.cc b/pdns/rfc2136handler.cc
index e9434ecb80776ea85dbde635e0883991b7cc6153..c1fd0554c297017626786bdab8e2caba79ebd8c2 100755 (executable)
--- 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 0859eb002d6aefeb44ca0e02128eb29fd375d853..66ab2dd79c44cdfd81869b7b7aeaa0e1cee2f9db 100755 (executable)
--- 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