From 237724c0c715f9e6fad84fbd2c2855b6d978b8a8 Mon Sep 17 00:00:00 2001
From: Giovanni Bajo <rasky@develer.com>
Date: Thu, 5 Apr 2012 02:46:52 +0200
Subject: [PATCH] Rename existing DNSSEC macros into DNSSEC_PROXY.

---
 src/dnsmasq.h | 2 +-
 src/forward.c | 2 +-
 src/option.c  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index f37034d..92a6a43 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -213,7 +213,7 @@ struct event_desc {
 #define OPT_NO_OVERRIDE    30
 #define OPT_NO_REBIND      31
 #define OPT_ADD_MAC        32
-#define OPT_DNSSEC         33
+#define OPT_DNSSEC_PROXY   33
 #define OPT_CONSEC_ADDR    34
 #define OPT_CONNTRACK      35
 #define OPT_FQDN_UPDATE    36
diff --git a/src/forward.c b/src/forward.c
index 6c9f646..7d106c9 100644
--- a/src/forward.c
+++ b/src/forward.c
@@ -476,7 +476,7 @@ static size_t process_reply(struct dns_header *header, time_t now,
     }
 
   /* 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;
 
   if (OPCODE(header) != QUERY || (RCODE(header) != NOERROR && RCODE(header) != NXDOMAIN))
diff --git a/src/option.c b/src/option.c
index b03388a..cff9ce1 100644
--- a/src/option.c
+++ b/src/option.c
@@ -109,7 +109,7 @@ struct myoption {
 #define LOPT_NO_REBIND 298
 #define LOPT_LOC_REBND 299
 #define LOPT_ADD_MAC   300
-#define LOPT_DNSSEC    301
+#define LOPT_SEC_PROXY 301
 #define LOPT_INCR_ADDR 302
 #define LOPT_CONNTRACK 303
 #define LOPT_FQDN      304
@@ -250,7 +250,7 @@ static const struct myoption opts[] =
     { "dhcp-generate-names", 2, 0, LOPT_GEN_NAMES },
     { "rebind-localhost-ok", 0, 0,  LOPT_LOC_REBND },
     { "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 },
     { "conntrack", 0, 0, LOPT_CONNTRACK },
     { "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_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_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_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 },