From 62f69f9b40827d15402a6174981e55c293a8601d Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 1 Aug 2018 13:49:27 +0000
Subject: [PATCH] - Fix to remove systemd sockaddr function check, that is not 
  always present.  Make socket activation more lenient.  But not   different
 when socket activation is not used.

git-svn-id: file:///svn/unbound/trunk@4824 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 doc/Changelog             |  5 +++++
 services/listen_dnsport.c | 13 ++-----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/Changelog b/doc/Changelog
index 764150280..09956a5dd 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+1 August 2018: Wouter
+	- Fix to remove systemd sockaddr function check, that is not
+	  always present.  Make socket activation more lenient.  But not
+	  different when socket activation is not used.
+
 31 July 2018: Wouter
 	- Patches from Jim Hague (Sinodun) for EDNS KeepAlive.
 	- Sort out test runs when the build directory isn't the project
diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c
index 5cae35ec8..7cd341e90 100644
--- a/services/listen_dnsport.c
+++ b/services/listen_dnsport.c
@@ -144,17 +144,8 @@ systemd_get_activated(int family, int socktype, int listen,
 	
 	for(i = 0; i < r; i++) {
 		if(sd_is_socket(SD_LISTEN_FDS_START + i, family, socktype, listen)) {
-			if( (family == AF_INET || family == AF_INET6) ) {
-				if(sd_is_socket_sockaddr(
-					SD_LISTEN_FDS_START + i, family,
-					addr, addrlen)) {
-					s = SD_LISTEN_FDS_START + i;
-					break;
-				}
-			} else {
-				s = SD_LISTEN_FDS_START + i;
-				break;
-			}
+			s = SD_LISTEN_FDS_START + i;
+			break;
 		}
 	}
 	if (s == -1) {