From ec50444aceea775998afbc65640d05b13790487b Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 8 Oct 2008 17:46:30 +0000
Subject: [PATCH] Field for concurrent incoming transfers

---
 bind8/CHANGELOG           | 2 +-
 bind8/conf_forwarding.cgi | 3 +++
 bind8/lang/en             | 1 +
 bind8/save_forwarding.cgi | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bind8/CHANGELOG b/bind8/CHANGELOG
index d95b6fbe1..5e8a9e47b 100644
--- a/bind8/CHANGELOG
+++ b/bind8/CHANGELOG
@@ -89,5 +89,5 @@ Moved buttons for deleting, moving and converting zones up to the page shown whe
 Switched to the new root zone file available from Internic.
 Restrictions that apply to all zones in a view (such as allowed IPs for transfers and queries) can now be set on the Edit Client View page.
 Made the Find Free IPs page visible, for finding addresses in a master zone that are not currently used.
-Added a field to limit concurrent outgoing zone transfers to the Forwarding and Transfers page.
+Added a field to limit concurrent outgoing zone transfers and incoming transfers per nameserver to the Forwarding and Transfers page.
 Ignore tailing dots in zone names in named.conf.
diff --git a/bind8/conf_forwarding.cgi b/bind8/conf_forwarding.cgi
index d874c14fa..f6c120f94 100755
--- a/bind8/conf_forwarding.cgi
+++ b/bind8/conf_forwarding.cgi
@@ -31,6 +31,9 @@ print &choice_input($text{'forwarding_format'}, 'transfer-format', $mems,
 print &opt_input($text{'forwarding_in'}, "transfers-in",
 		 $mems, $text{'default'}, 4);
 
+print &opt_input($text{'forwarding_per_ns'}, "transfers-per-ns",
+		 $mems, $text{'default'}, 4);
+
 print &opt_input($text{'forwarding_out'}, "transfers-out",
 		 $mems, $text{'default'}, 4);
 
diff --git a/bind8/lang/en b/bind8/lang/en
index 117f7a8cd..6fa872c42 100644
--- a/bind8/lang/en
+++ b/bind8/lang/en
@@ -565,6 +565,7 @@ forwarding_one=One at a time
 forwarding_many=Many
 forwarding_in=Maximum concurrent incoming zone transfers
 forwarding_out=Maximum concurrent outgoing zone transfers
+forwarding_per_ns=Maximum concurrent incoming transfers per server
 forwarding_err=Failed to save forwarding and transfer options
 forwarding_emins=Missing or invalid maximum transfer time
 forwarding_etrans=Missing or invalid maximum concurrent transfers
diff --git a/bind8/save_forwarding.cgi b/bind8/save_forwarding.cgi
index fd7a18c84..4b7a837a7 100755
--- a/bind8/save_forwarding.cgi
+++ b/bind8/save_forwarding.cgi
@@ -15,6 +15,7 @@ $options = &find("options", $conf);
 &save_opt('max-transfer-time-in', \&check_mins, $options, 1);
 &save_choice('transfer-format', $options, 1);
 &save_opt('transfers-in', \&check_trans, $options, 1);
+&save_opt('transfers-per-ns', \&check_trans, $options, 1);
 &save_opt('transfers-out', \&check_trans, $options, 1);
 
 &flush_file_lines();