[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 868d2a1fff7d6c217bd860567a956f27d0851e78

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 868d2a1fff7d6c217bd860567a956f27d0851e78

[git]

[-- Attachment #1: Type: text/plain, Size: 2628 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  868d2a1fff7d6c217bd860567a956f27d0851e78 (commit)
       via  8b1eb795ac5a6fe1d0d2fda5c70a4b251b1188f9 (commit)
      from  3ec5ba501ebe5a9579cbf4c78a6f4ee157f839ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 868d2a1fff7d6c217bd860567a956f27d0851e78
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Oct 15 22:32:21 2016 +0100

    unbound: Omit reverse PTRs if address equals GREEN
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 8b1eb795ac5a6fe1d0d2fda5c70a4b251b1188f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Oct 15 22:32:05 2016 +0100

    unbound-dhcp-bridge: Make leases unique by IP address
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/unbound/unbound-dhcp-leases-bridge | 2 +-
 src/initscripts/init.d/unbound            | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/unbound/unbound-dhcp-leases-bridge b/config/unbound/unbound-dhcp-leases-bridge
index 4804dba..54cd813 100644
--- a/config/unbound/unbound-dhcp-leases-bridge
+++ b/config/unbound/unbound-dhcp-leases-bridge
@@ -222,7 +222,7 @@ class DHCPLeases(object):
 				# exists in the list of known leases. If so replace
 				# if with the most recent lease
 				for i, l in enumerate(leases):
-					if l.hwaddr == lease.hwaddr:
+					if l.ipaddr == lease.ipaddr:
 						leases[i] = max(lease, l)
 						break
 
diff --git a/src/initscripts/init.d/unbound b/src/initscripts/init.d/unbound
index 4c6b452..4e42477 100644
--- a/src/initscripts/init.d/unbound
+++ b/src/initscripts/init.d/unbound
@@ -138,6 +138,9 @@ update_hosts() {
 
 		unbound-control -q local_data "${fqdn} ${LOCAL_TTL} IN A ${address}"
 
+		# Skip reverse resolution if the address equals the GREEN address
+		[ "${address}" = "${GREEN_ADDRESS}" ] && continue
+
 		# Add RDNS
 		address=$(ip_address_revptr ${address})
 		unbound-control -q local_data "${address} ${LOCAL_TTL} IN PTR ${fqdn}"


hooks/post-receive
--
IPFire 2.x development tree