Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

setKey() was actually "appendKey()". In addition, '-k' would not override for server configuration #5199

Merged
merged 2 commits into from Apr 12, 2017

Conversation

@ahupowerdns
Copy link
Contributor

@ahupowerdns ahupowerdns commented Mar 23, 2017

Unified -k behaviour for client and server mode now.

Short description

Using setKey() at runtime actually did not work if a key had been set already. setKey() was in fact appendKey(). Furthermore, -k did not operate in server mode. In client mode, there was an ugly override to make -k work. Unified this now to too server and client modes.

Checklist

I have:

  • read the CONTRIBUTING.md document
  • compiled and tested this code
  • included documentation (including possible behaviour changes)
  • documented the code
  • added or modified regression test(s)
  • added or modified unit test(s)
…ride for server configuration. Unified -k behaviour for client and server mode now.
}
g_outputBuffer=string("Unable to decode ")+key+" as Base64";
errlog("%s", g_outputBuffer);
}

This comment has been minimized.

@rgacogne

rgacogne Mar 27, 2017
Member

Shouldn't we try to decode the new key into a temporary string before clearing the existing one?

This comment has been minimized.

@ahupowerdns

ahupowerdns Mar 27, 2017
Author Contributor

yes, will make it so. thanks!

This comment has been minimized.

@ahupowerdns ahupowerdns merged commit a7d65a7 into PowerDNS:master Apr 12, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@ahupowerdns ahupowerdns deleted the ahupowerdns:dnsdistrekey branch Apr 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants