diff options
| author | Stephane Lapie <stephane.lapie@asahinet.com> | 2014-09-09 10:38:18 +0900 |
|---|---|---|
| committer | Stephane Lapie <stephane.lapie@asahinet.com> | 2014-09-09 10:38:18 +0900 |
| commit | 2540793065bc8539001aec717745474569c8ff77 (patch) | |
| tree | 0160e83bf24c77dfa9d73e2d2d2ce5eeb90610bb /config/bind | |
| parent | c93a3c793d53e9076b49e05c32a7c132329ff353 (diff) | |
| parent | 8a33d84b6e7d52e2e7dd414c03428ce6da0296a2 (diff) | |
| download | pfsense-packages-2540793065bc8539001aec717745474569c8ff77.tar.gz pfsense-packages-2540793065bc8539001aec717745474569c8ff77.tar.bz2 pfsense-packages-2540793065bc8539001aec717745474569c8ff77.zip | |
Merge git+ssh://github.com/pfsense/pfsense-packages
Diffstat (limited to 'config/bind')
| -rw-r--r-- | config/bind/bind.inc | 2 | ||||
| -rw-r--r-- | config/bind/bind_zones.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/bind/bind.inc b/config/bind/bind.inc index 9b4a444d..4f6e0d87 100644 --- a/config/bind/bind.inc +++ b/config/bind/bind.inc @@ -347,7 +347,7 @@ EOD; switch ($zonetype){ case "slave": $bind_conf .= "\t\tmasters { $zoneipslave; };\n"; - $bind_conf .= "\t\tallow-transfer {none;};\n"; + $bind_conf .= "\t\tallow-transfer { $zoneallowtransfer;};\n"; $bind_conf .= "\t\tnotify no;\n"; break; case "forward": diff --git a/config/bind/bind_zones.xml b/config/bind/bind_zones.xml index 24c3b99e..d771ada6 100644 --- a/config/bind/bind_zones.xml +++ b/config/bind/bind_zones.xml @@ -432,7 +432,7 @@ <custom_php_command_before_form> </custom_php_command_before_form> <custom_php_validation_command> - if ($_POST['type']=="master") + if ($_POST['type']=="master" and $_POST['serial']=="") $_POST['serial']=(date("U")+ 1000000000); bind_zone_validate($_POST, $input_errors); </custom_php_validation_command> |