Makefile                     |  1 -

 contrib/lease-tools/Makefile |  2 +-

 dnsmasq.conf.example         | 10 +++++++---

 src/helper.c                 |  2 +-

 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile

index 48e8d3b..8fd3244 100644

--- a/Makefile

+++ b/Makefile

@@ -27,7 +27,6 @@ DESTDIR       =

 CFLAGS        = -Wall -W -O2

 LDFLAGS       = 

 COPTS         = 

-RPM_OPT_FLAGS = 

 LIBS          = 

 #################################################################

diff --git a/contrib/lease-tools/Makefile b/contrib/lease-tools/Makefile

index f38f2ed..20d3934 100644

--- a/contrib/lease-tools/Makefile

+++ b/contrib/lease-tools/Makefile

@@ -1,4 +1,4 @@

-CFLAGS?= -O2 -Wall -W

+CFLAGS?= -O2 -Wall -W $(RPM_OPT_FLAGS)

 all: dhcp_release dhcp_release6 dhcp_lease_time

diff --git a/dnsmasq.conf.example b/dnsmasq.conf.example

index 0cbf572..edb0ce5 100644

--- a/dnsmasq.conf.example

+++ b/dnsmasq.conf.example

@@ -22,7 +22,7 @@

 # Uncomment these to enable DNSSEC validation and caching:

 # (Requires dnsmasq to be built with DNSSEC option.)

-#conf-file=%%PREFIX%%/share/dnsmasq/trust-anchors.conf

+#conf-file=/usr/share/dnsmasq/trust-anchors.conf

 #dnssec

 # Replies which are not DNSSEC signed may be legitimate, because the domain

@@ -142,7 +142,11 @@

 # Set this (and domain: see below) if you want to have a domain

 # automatically added to simple names in a hosts-file.

-#expand-hosts

+expand-hosts

+

+# Return answers to DNS queries from /etc/hosts which depend

+# on the interface over which the query was received.

+localise-queries

 # Set the domain for dnsmasq. this is optional, but if it is set, it

 # does the following things.

@@ -675,7 +679,7 @@

 # Include another lot of configuration options.

 #conf-file=/etc/dnsmasq.more.conf

-#conf-dir=/etc/dnsmasq.d

+conf-dir=/etc/dnsmasq.conf.d

 # Include all the files in a directory except those ending in .bak

 #conf-dir=/etc/dnsmasq.d,.bak

diff --git a/src/helper.c b/src/helper.c

index ee2cab3..ab10a46 100644

--- a/src/helper.c

+++ b/src/helper.c

@@ -82,7 +82,7 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)

   int i, pipefd[2];

   struct sigaction sigact;

   unsigned char *alloc_buff = NULL;

-  

+

   /* create the pipe through which the main program sends us commands,

      then fork our process. */

   if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)