Browse Source

for notify, use consistent parameter with other xfrin commands.

git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac221b@2475 e5f2f494-b856-4b98-b285-d166d9295462
JINMEI Tatuya 15 years ago
parent
commit
4f65d1a1ca
2 changed files with 4 additions and 3 deletions
  1. 1 1
      src/bin/auth/auth_srv.cc
  2. 3 2
      src/bin/xfrin/xfrin.py.in

+ 1 - 1
src/bin/auth/auth_srv.cc

@@ -425,7 +425,7 @@ AuthSrvImpl::processNotify(const IOMessage& io_message, Message& message,
         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 {

+ 3 - 2
src/bin/xfrin/xfrin.py.in

@@ -409,7 +409,8 @@ a separate method for the convenience of unit tests.
                 # 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 @@ a separate method for the convenience of unit tests.
                 # 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)