From c87f987e98813056d5fead93f0fccb62378d7fcf Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Tue, 19 Feb 2013 09:15:18 +0100 Subject: [PATCH] add default for SOA contact e-mail --- pdns/common_startup.cc | 1 + pdns/dnsbackend.cc | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc index 4f0959cbdb..f010e48bb6 100644 --- a/pdns/common_startup.cc +++ b/pdns/common_startup.cc @@ -67,6 +67,7 @@ void declareArguments() ::arg().set("wildcard-url","Process URL and MBOXFW records")="no"; ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4"; ::arg().set("default-soa-name","name to insert in the SOA record if none set in the backend")="a.misconfigured.powerdns.server"; + ::arg().set("default-soa-mail","mailadres to insert in the SOA record if none set in the backend")=""; ::arg().set("distributor-threads","Default number of Distributor (backend) threads to start")="3"; ::arg().set("signing-threads","Default number of signer threads to start")="3"; ::arg().set("receiver-threads","Default number of Distributor (backend) threads to start")="1"; diff --git a/pdns/dnsbackend.cc b/pdns/dnsbackend.cc index 910bc8d6b1..270c0639e9 100644 --- a/pdns/dnsbackend.cc +++ b/pdns/dnsbackend.cc @@ -24,6 +24,7 @@ #include #include "dnspacket.hh" +#include "dns.hh" string DNSBackend::getRemote(DNSPacket *p) { @@ -236,8 +237,14 @@ bool DNSBackend::getSOA(const string &domain, SOAData &sd, DNSPacket *p) if(sd.nameserver.empty()) sd.nameserver=arg()["default-soa-name"]; - if(sd.hostmaster.empty()) - sd.hostmaster="hostmaster."+domain; + if(sd.hostmaster.empty()) { + if (!arg().isEmpty("default-soa-mail")) { + sd.hostmaster=arg()["default-soa-mail"]; + attodot(sd.hostmaster); + } + else + sd.hostmaster="hostmaster."+domain; + } if(!sd.serial) { // magic time! DLOG(L<