zoneconf.in: Auto-DNSsec support for dynamic zones.

diff --git a/zoneconf.in b/zoneconf.in
index f0dcdef463a24955c55846e3577b345b0b016182..8197a4d4db5795268ef4792a1b4a47007294fd80 100755 (executable)
--- a/zoneconf.in
+++ b/zoneconf.in
@@ -970,6 +970,7 @@ define-configuration-space policy ZONECFG {
 define-configuration-space dynamic ZONECFG {
   prefix "ddns-"
   define-simple key "ddns"
 define-configuration-space dynamic ZONECFG {
   prefix "ddns-"
   define-simple key "ddns"

+  define-simple auto-dnssec off

   define-list types {A TXT PTR}
 
   define policy {body} {
   define-list types {A TXT PTR}
 
   define policy {body} {


@@ -1004,7 +1005,6 @@ define-configuration-space zone ZONECFG {
           "-o%z" \
           "-f%o" \
           "%f"]
           "-o%z" \
           "-f%o" \
           "%f"]

-  define-simple auto-dnssec off

   define-list reload-command [list "$BINDPROGS/rndc" "reload" "%z" "IN" "%v"]
   define-list autosign-command [list "$BINDPROGS/rndc" "sign" "%z" "IN" "%v"]
   define-list checkzone-command \
   define-list reload-command [list "$BINDPROGS/rndc" "reload" "%z" "IN" "%v"]
   define-list autosign-command [list "$BINDPROGS/rndc" "sign" "%z" "IN" "%v"]
   define-list checkzone-command \


@@ -1260,7 +1260,12 @@ proc write-zone-stanza {view chan config} {
       puts $chan "\ttype master;"
       puts $chan "\tfile \"$zone(server-file-name)\";"
       switch -exact -- $zone(type) {
       puts $chan "\ttype master;"
       puts $chan "\tfile \"$zone(server-file-name)\";"
       switch -exact -- $zone(type) {

-       dynamic { write-ddns-update-policy "\t" $chan $config }
+       dynamic {
+         write-ddns-update-policy "\t" $chan $config
+         if {![string equal $zone(ddns-auto-dnssec) off]} {
+           puts $chan "\tauto-dnssec $zone(ddns-auto-dnssec);"
+         }
+       }

       }
     }
     slave {
       }
     }
     slave {


@@ -1269,9 +1274,6 @@ proc write-zone-stanza {view chan config} {
       foreach host $zone(masters) { lappend masters [host-addr $host] }
       puts $chan "\tmasters { [join $masters {; }]; };"
       puts $chan "\tfile \"$zone(file-name)\";"
       foreach host $zone(masters) { lappend masters [host-addr $host] }
       puts $chan "\tmasters { [join $masters {; }]; };"
       puts $chan "\tfile \"$zone(file-name)\";"

-      if {![string equal $zone(auto-dnssec) off]} {
-       puts $chan "\tauto-dnssec $zone(auto-dnssec);"
-      }

       switch -exact -- $zone(type) {
        dynamic { puts $chan "\tallow-update-forwarding { any; };" }
       }
       switch -exact -- $zone(type) {
        dynamic { puts $chan "\tallow-update-forwarding { any; };" }
       }


@@ -1493,7 +1495,7 @@ defcmd sign {} {
          }
        }
       } elseif {[string equal $zone(type) dynamic] &&
          }
        }
       } elseif {[string equal $zone(type) dynamic] &&

-               ![string equal $zone(auto-dnssec) off]} {
+               ![string equal $zone(ddns-auto-dnssec) off]} {

        ## Dynamic zone: get BIND to re-sign it.
 
        if {![run "re-sign zone `$zone(name) in server view `$view'" \
        ## Dynamic zone: get BIND to re-sign it.
 
        if {![run "re-sign zone `$zone(name) in server view `$view'" \