]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Logs in DHCPv6 not suppressed by dhcp6-quiet.
authorSimon Kelley <simon@thekelleys.org.uk>
Sat, 25 Apr 2015 20:46:10 +0000 (21:46 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Sat, 25 Apr 2015 20:46:10 +0000 (21:46 +0100)
CHANGELOG
src/rfc3315.c

index 7f2b1e002e9e50ca1891612c5960d2ba5fda5c91..af2b22cf8f732f0f4e0183935f53b2c38c54ad23 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -103,7 +103,11 @@ version 2.73
            Previously we provided correct answers to PTR queries
            in such zones (including NS and SOA) but not direct
            NS and SOA queries. Thanks to Johnny S. Lee for 
-           pointing out the problem.
+           pointing out the problem.
+
+           Fix logging of DHCPREPLY which should be suppressed 
+           by quiet-dhcp6. Thanks to J. Pablo Abonia for 
+           spotting the problem.
 
        
 version 2.72
index c45116a40a091913523ff8e88a84e0fbd0371ed1..b4f5dd2db61fc6469282fdd479621fad46b4c0b6 100644 (file)
@@ -1047,9 +1047,9 @@ static int dhcp6_no_relay(struct state *state, int msg_type, void *inbuff, size_
                  {
                    preferred_time = valid_time = 0;
                    message = _("address invalid");
-                 }
+                 } 
 
-               if (message)
+               if (message && (message != state->hostname))
                  log6_packet(state, "DHCPREPLY", req_addr, message);   
                else
                  log6_quiet(state, "DHCPREPLY", req_addr, message);