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 improve systemd socket activation code file descriptor

Browse source 
assignment.


git-svn-id: file:///svn/unbound/trunk@4778 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-07-12 10:35:33 +00:00
parent 23dc22b78d
commit f93746b1af
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
12 July 2018: Wouter
- Fix to improve systemd socket activation code file descriptor
assignment.
10 July 2018: Wouter 10 July 2018: Wouter
- Note in documentation that the cert name match code needs - Note in documentation that the cert name match code needs
OpenSSL 1.1.0 or later to be enabled. OpenSSL 1.1.0 or later to be enabled.

9
services/listen_dnsport.c
View file

@ -144,9 +144,18 @@ systemd_get_activated(int family, int socktype, int listen,
for(i = 0; i < r; i++) { for(i = 0; i < r; i++) {
if(sd_is_socket(SD_LISTEN_FDS_START + i, family, socktype, listen)) { 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; s = SD_LISTEN_FDS_START + i;
break; break;
} }
} else {
s = SD_LISTEN_FDS_START + i;
break;
}
}
} }
if (s == -1) { if (s == -1) {
if (addr) if (addr)