BIND 10 trac811, updated. 5d6455c7b141c79efee8a1eb1b0f3aea28b2eb74 [trac811] remove 'general' master_addr, and add tsig param to retransfer

[BIND 10 source code commits]

The branch, trac811 has been updated
       via  5d6455c7b141c79efee8a1eb1b0f3aea28b2eb74 (commit)
      from  fd64f870222ac95fc7d3eea86e41052883210f49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5d6455c7b141c79efee8a1eb1b0f3aea28b2eb74
Author: Jelte Jansen <jelte at isc.org>
Date:   Tue Apr 12 17:00:00 2011 +0200

    [trac811] remove 'general' master_addr, and add tsig param to retransfer

-----------------------------------------------------------------------

Summary of changes:
 src/bin/xfrin/xfrin.py.in |    8 ++++++++
 src/bin/xfrin/xfrin.spec  |   16 +++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 10a866e..eb1b123 100755
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -455,6 +455,9 @@ class Xfrin:
                 # master address, or else do transfer from the configured masters.                
                 (zone_name, rrclass) = self._parse_zone_name_and_class(args)
                 master_addr = self._parse_master_and_port(args)
+                tsig_key = self._parse_tsig_key(args)
+                if tsig_key is not None:
+                    log_error("TSIG key specified for retransfer, but not implemented yet")
                 db_file = args.get('db_file') or self._get_db_file()
                 ret = self.xfrin_start(zone_name, 
                                        rrclass, 
@@ -490,6 +493,11 @@ class Xfrin:
         port = args.get('port') or self._master_port
         master = args.get('master') or self._master_addr
         return build_addr_info(master, port)
+
+    def _parse_tsig_key(self, args):
+        if 'tsig_key' in args:
+            return args.get('tsig_key')
+        return None
  
     def _get_db_file(self):
         #TODO, the db file path should be got in auth server's configuration
diff --git a/src/bin/xfrin/xfrin.spec b/src/bin/xfrin/xfrin.spec
index 61ddaad..ebacdf2 100644
--- a/src/bin/xfrin/xfrin.spec
+++ b/src/bin/xfrin/xfrin.spec
@@ -8,17 +8,6 @@
         "item_type": "integer",
         "item_optional": false,
         "item_default": 10
-      },
-      {
-        "item_name": "master_addr",
-        "item_type": "string",
-        "item_optional": false,
-        "item_default": ""
-      },
-      { "item_name": "master_port",
-        "item_type": "integer",
-        "item_optional": false,
-        "item_default": 53
       }
     ],
     "commands": [
@@ -44,6 +33,11 @@
             "item_default": ""
           },
           {
+            "item_name": "tsig_key",
+            "item_type": "string",
+            "item_optional": true
+          },
+          {
             "item_name": "port",
             "item_type": "integer",
             "item_optional": true,