[svn] commit: r2475 - in /branches/trac221b/src/bin: auth/auth_srv.cc xfrin/xfrin.py.in

[BIND 10 source code commits]

Author: jinmei
Date: Sat Jul 10 07:09:25 2010
New Revision: 2475

Log:
for notify, use consistent parameter with other xfrin commands.

Modified:
    branches/trac221b/src/bin/auth/auth_srv.cc
    branches/trac221b/src/bin/xfrin/xfrin.py.in

Modified: branches/trac221b/src/bin/auth/auth_srv.cc
==============================================================================
--- branches/trac221b/src/bin/auth/auth_srv.cc (original)
+++ branches/trac221b/src/bin/auth/auth_srv.cc Sat Jul 10 07:09:25 2010
@@ -425,7 +425,7 @@
         io_message.getRemoteEndpoint().getAddress().toText();
     static const string command_template_start =
         "{\"command\": [\"notify\", {\"zone_name\" : \"";
-    static const string command_template_mid = "\", \"master_ip\" : \"";
+    static const string command_template_mid = "\", \"master\" : \"";
     static const string command_template_end = "\"}]}";
 
     try {

Modified: branches/trac221b/src/bin/xfrin/xfrin.py.in
==============================================================================
--- branches/trac221b/src/bin/xfrin/xfrin.py.in (original)
+++ branches/trac221b/src/bin/xfrin/xfrin.py.in Sat Jul 10 07:09:25 2010
@@ -409,7 +409,8 @@
                 # the default)
                 rrclass = RRClass.IN()
                 zone_name, master_addr, db_file = self._parse_cmd_params(args)
-                ret = self.xfrin_start(zone_name, rrclass, db_file, master_addr,
+                ret = self.xfrin_start(zone_name, rrclass, db_file,
+                                       master_addr,
                                    False if command == 'retransfer' else True)
                 answer = create_answer(ret[0], ret[1])
             elif command == 'notify':
@@ -418,7 +419,7 @@
                 # Zone Manager module.
                 db_file = '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
                 ret = self.xfrin_start(args['zone_name'], db_file,
-                                       args['master_ip'], port=53)
+                                       args['master'], port=53)
                 answer = create_answer(ret[0], ret[1])
             else:
                 answer = create_answer(1, 'unknown command: ' + command)