src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch

   1 From a5ae1f85873829efe473075ad77806cc02792622 Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Sat, 25 Apr 2015 21:46:10 +0100
   4 Subject: [PATCH 83/98] Logs in DHCPv6 not suppressed by dhcp6-quiet.
   5
   6 ---
   7  CHANGELOG     | 6 +++++-
   8  src/rfc3315.c | 4 ++--
   9  2 files changed, 7 insertions(+), 3 deletions(-)
  10
  11 diff --git a/CHANGELOG b/CHANGELOG
  12 index 7f2b1e002e9e..af2b22cf8f73 100644
  13 --- a/CHANGELOG
  14 +++ b/CHANGELOG
  15 @@ -103,7 +103,11 @@ version 2.73
  16             Previously we provided correct answers to PTR queries
  17             in such zones (including NS and SOA) but not direct
  18             NS and SOA queries. Thanks to Johnny S. Lee for
  19 -           pointing out the problem.
  20 +           pointing out the problem.
  21 +
  22 +           Fix logging of DHCPREPLY which should be suppressed
  23 +           by quiet-dhcp6. Thanks to J. Pablo Abonia for
  24 +           spotting the problem.
  25
  26
  27  version 2.72
  28 diff --git a/src/rfc3315.c b/src/rfc3315.c
  29 index c45116a40a09..b4f5dd2db61f 100644
  30 --- a/src/rfc3315.c
  31 +++ b/src/rfc3315.c
  32 @@ -1047,9 +1047,9 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
  33                   {
  34                     preferred_time = valid_time = 0;
  35                     message = _("address invalid");
  36 -                 }
  37 +                 }
  38
  39 -               if (message)
  40 +               if (message && (message != state->hostname))
  41                   log6_packet(state, "DHCPREPLY", req_addr, message);
  42                 else
  43                   log6_quiet(state, "DHCPREPLY", req_addr, message);
  44 --
  45 2.1.0
  46