upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix to remove systemd sockaddr function check, that is not

Browse source 
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
This commit is contained in:
Wouter Wijngaards 2018-08-01 13:49:27 +00:00
parent 168bc963d3
commit 62f69f9b40
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/Changelog
View file

@ -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

13
services/listen_dnsport.c
View file

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