Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename existing DNSSEC macros into DNSSEC_PROXY.

Browse Source
This commit is contained in:
Giovanni Bajo
2012-04-05 02:46:52 +02:00
committed by Simon Kelley
parent 53f84c7f62
commit 237724c0c7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dnsmasq.h
View File

@@ -213,7 +213,7 @@ struct event_desc {
#define OPT_NO_OVERRIDE 30 #define OPT_NO_OVERRIDE 30
#define OPT_NO_REBIND 31 #define OPT_NO_REBIND 31
#define OPT_ADD_MAC 32 #define OPT_ADD_MAC 32
#define OPT_DNSSEC 33 #define OPT_DNSSEC_PROXY 33
#define OPT_CONSEC_ADDR 34 #define OPT_CONSEC_ADDR 34
#define OPT_CONNTRACK 35 #define OPT_CONNTRACK 35
#define OPT_FQDN_UPDATE 36 #define OPT_FQDN_UPDATE 36

2
src/forward.c
View File

@@ -476,7 +476,7 @@ static size_t process_reply(struct dns_header *header, time_t now,
} }
/* RFC 4035 sect 4.6 para 3 */ /* RFC 4035 sect 4.6 para 3 */
if (!is_sign && !option_bool(OPT_DNSSEC)) if (!is_sign && !option_bool(OPT_DNSSEC_PROXY))
header->hb4 &= ~HB4_AD; header->hb4 &= ~HB4_AD;
if (OPCODE(header) != QUERY || (RCODE(header) != NOERROR && RCODE(header) != NXDOMAIN)) if (OPCODE(header) != QUERY || (RCODE(header) != NOERROR && RCODE(header) != NXDOMAIN))

6
src/option.c
View File

@@ -109,7 +109,7 @@ struct myoption {
#define LOPT_NO_REBIND 298 #define LOPT_NO_REBIND 298
#define LOPT_LOC_REBND 299 #define LOPT_LOC_REBND 299
#define LOPT_ADD_MAC 300 #define LOPT_ADD_MAC 300
#define LOPT_DNSSEC 301 #define LOPT_SEC_PROXY 301
#define LOPT_INCR_ADDR 302 #define LOPT_INCR_ADDR 302
#define LOPT_CONNTRACK 303 #define LOPT_CONNTRACK 303
#define LOPT_FQDN 304 #define LOPT_FQDN 304
@@ -250,7 +250,7 @@ static const struct myoption opts[] =
{ "dhcp-generate-names", 2, 0, LOPT_GEN_NAMES }, { "dhcp-generate-names", 2, 0, LOPT_GEN_NAMES },
{ "rebind-localhost-ok", 0, 0, LOPT_LOC_REBND }, { "rebind-localhost-ok", 0, 0, LOPT_LOC_REBND },
{ "add-mac", 0, 0, LOPT_ADD_MAC }, { "add-mac", 0, 0, LOPT_ADD_MAC },
{ "proxy-dnssec", 0, 0, LOPT_DNSSEC }, { "proxy-dnssec", 0, 0, LOPT_SEC_PROXY },
{ "dhcp-sequential-ip", 0, 0, LOPT_INCR_ADDR }, { "dhcp-sequential-ip", 0, 0, LOPT_INCR_ADDR },
{ "conntrack", 0, 0, LOPT_CONNTRACK }, { "conntrack", 0, 0, LOPT_CONNTRACK },
{ "dhcp-client-update", 0, 0, LOPT_FQDN }, { "dhcp-client-update", 0, 0, LOPT_FQDN },
@@ -394,7 +394,7 @@ static struct {
{ LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL }, { LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL },
{ LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL }, { LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL },
{ LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL }, { LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL },
{ LOPT_DNSSEC, OPT_DNSSEC, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL }, { LOPT_SEC_PROXY, OPT_DNSSEC_PROXY, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL },
{ LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL }, { LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL },
{ LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL }, { LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL },
{ LOPT_FQDN, OPT_FQDN_UPDATE, NULL, gettext_noop("Allow DHCP clients to do their own DDNS updates."), NULL }, { LOPT_FQDN, OPT_FQDN_UPDATE, NULL, gettext_noop("Allow DHCP clients to do their own DDNS updates."), NULL },