- 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

diff --git a/doc/Changelog b/doc/Changelog
index 76415028092555e92993abc77ee8dcf0478e7933..09956a5dd71576c6b1ec639dfe6aa98f98e1cb6c 100644 (file)
--- 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 5cae35ec88afa9db12af78cb8ce1f2ae9c45e44a..7cd341e9022db9abbfb608ad94de545417c823d0 100644 (file)
--- 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) {