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) {