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.

Sign up for GitHub

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

Jump to bottom

pdns_control notify: handle slave w/o renotify properly #6691

Merged
merged 1 commit into from May 31, 2018
Merged

pdns_control notify: handle slave w/o renotify properly #6691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pdns/dynhandler.cc
View file
Open in desktop
Expand Up @@ -261,7 +261,7 @@ string DLNotifyHostHandler(const vector<string>&parts, Utility::pid_t ppid)
ostringstream os;
if(parts.size()!=3)
return "syntax: notify-host domain ip";
if(!::arg().mustDo("master") && !::arg().mustDo("slave-renotify"))
if(!::arg().mustDo("master") && !(::arg().mustDo("slave") && ::arg().mustDo("slave-renotify")))
return "PowerDNS not configured as master or slave with re-notifications";

DNSName domain;
Expand Down Expand Up @@ -289,7 +289,7 @@ string DLNotifyHandler(const vector<string>&parts, Utility::pid_t ppid)
UeberBackend B;
if(parts.size()!=2)
return "syntax: notify domain";
if(!::arg().mustDo("master") && !::arg().mustDo("slave-renotify"))
if(!::arg().mustDo("master") && !(::arg().mustDo("slave") && ::arg().mustDo("slave-renotify")))
return "PowerDNS not configured as master or slave with re-notifications";
g_log<<Logger::Warning<<"Notification request for domain '"<<parts[1]<<"' received from operator"<<endl;

Expand Down