Commit aa0ddfbb authored by Jelte Jansen's avatar Jelte Jansen
Browse files

[trac781] Merge branch 'trac781' of ssh://bind10.isc.org/var/bind10/git/bind10 into trac781

Conflicts:
	src/lib/dns/tsigkey.cc
parents a7c4e0bc 4f1d8d0f
SUBDIRS = exceptions crypto dns cc config python xfr bench log \
SUBDIRS = exceptions dns crypto cc config python xfr bench log \
asiolink nsas cache resolve testutils datasrc server_common
......@@ -156,8 +156,8 @@ TSIGKey::toText() const {
}
std::string secret_str = encodeBase64(secret_v);
return getKeyName().toText() + ":" + secret_str + ":" +
getAlgorithmName().toText();
return (getKeyName().toText() + ":" + secret_str + ":" +
getAlgorithmName().toText());
}
const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment