From: Jelte Jansen <jelte@isc.org>
Date: Tue, 11 Dec 2012 13:19:25 +0000 (+0100)
Subject: [master] Merge branch 'trac1351'
X-Git-Tag: bind10-1.0.0-beta-release~21^2~3^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e65b7b36f60f14b7abe083da411e6934cdfbae7a;p=thirdparty%2Fkea.git

[master] Merge branch 'trac1351'
---

e65b7b36f60f14b7abe083da411e6934cdfbae7a
diff --cc src/bin/xfrin/xfrin.py.in
index caae9d7efe,811869dfc0..da0f20702e
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@@ -34,9 -34,10 +34,10 @@@ from isc.datasrc import DataSourceClien
  import isc.net.parse
  from isc.xfrin.diff import Diff
  from isc.server_common.auth_command import auth_loadzone_command
+ from isc.server_common.tsig_keyring import init_keyring, get_keyring
  from isc.log_messages.xfrin_messages import *
  
 -isc.log.init("b10-xfrin")
 +isc.log.init("b10-xfrin", buffer=True)
  logger = isc.log.Logger("xfrin")
  
  # Pending system-wide debug level definitions, the ones we