mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Disable IPv4-mapped IPv6 addresses in the listener.

Browse Source 
Also store the host + port string and use it in error messages.
This commit is contained in:
Todd C. Miller
2020-04-08 08:54:28 -06:00
parent 55eb0a633c
commit 18ff60f6ff
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
logsrvd/logsrvd.c
View File

@@ -1468,10 +1468,17 @@ create_listener(struct listen_address *addr)
goto bad;
}
on = 1;
#ifdef IPV6_V6ONLY
if (addr->sa_un.sa.sa_family == AF_INET6) {
/* Disable IPv4-mapped IPv6 addresses. */
if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) == -1)
sudo_warn("IPV6_V6ONLY");
}
#endif
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1)
sudo_warn("SO_REUSEADDR");
if (bind(sock, &addr->sa_un.sa, addr->sa_len) == -1) {
sudo_warn("bind");
sudo_warn("%s", addr->sa_str);
goto bad;
}
if (listen(sock, SOMAXCONN) == -1) {
@@ -1483,6 +1490,8 @@ create_listener(struct listen_address *addr)
sudo_warn("fcntl(O_NONBLOCK)");
goto bad;
}
sudo_debug_printf(SUDO_DEBUG_INFO, "listening on %s (AF_INET%s)",
addr->sa_str, addr->sa_un.sa.sa_family == AF_INET6 ? "6" : "");
debug_return_int(sock);
bad: