aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2016-12-26 15:09:24 -0500
committerTom Yu <tlyu@mit.edu>2017-01-09 14:31:51 -0500
commit552a129fb857e7f6fa734011d69785ad912b3fc5 (patch)
tree3a62ac16b7e2c136dc8070cb0fe916b0c754f68b
parent9bb353d2484561d895293fdb4e268f44f6cb9670 (diff)
downloadkrb5-552a129fb857e7f6fa734011d69785ad912b3fc5.zip
krb5-552a129fb857e7f6fa734011d69785ad912b3fc5.tar.gz
krb5-552a129fb857e7f6fa734011d69785ad912b3fc5.tar.bz2
Fix KDC/kadmind startup on some IPv4-only systems
getaddrinfo(NULL, ...) may yield an IPv6 wildcard address on IPv4-only systems, and creating a socket for that address may result in an EAFNOSUPPORT error. Tolerate that error as long as we can bind at least one socket for the address. (cherry picked from commit 04c2bb56f5203b296b24314810eca02f5dc7e491) ticket: 8531 version_fixed: 1.15.1
-rw-r--r--src/lib/apputils/net-server.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c
index 171ecc4..d64ffdd 100644
--- a/src/lib/apputils/net-server.c
+++ b/src/lib/apputils/net-server.c
@@ -834,7 +834,7 @@ setup_addresses(struct socksetup *data)
};
krb5_error_code ret = 0;
size_t i;
- int err;
+ int err, bound_any;
struct bind_address addr;
struct addrinfo hints, *ai_list = NULL, *ai = NULL;
verto_callback vcb;
@@ -871,8 +871,12 @@ setup_addresses(struct socksetup *data)
* Loop through all the sockets that getaddrinfo could find to match
* the requested address. For wildcard listeners, this should usually
* have two results, one for each of IPv4 and IPv6, or one or the
- * other, depending on the system.
+ * other, depending on the system. On IPv4-only systems, getaddrinfo()
+ * may return both IPv4 and IPv6 addresses, but creating an IPv6 socket
+ * may give an EAFNOSUPPORT error, so tolerate that error as long as we
+ * can bind at least one socket.
*/
+ bound_any = 0;
for (ai = ai_list; ai != NULL; ai = ai->ai_next) {
/* Make sure getaddrinfo returned a socket with the same type that
* was requested. */
@@ -889,9 +893,15 @@ setup_addresses(struct socksetup *data)
_("Failed setting up a %s socket (for %s)"),
bind_type_names[addr.type],
paddr(ai->ai_addr));
- goto cleanup;
+ if (ret != EAFNOSUPPORT)
+ goto cleanup;
+ } else {
+ bound_any = 1;
}
}
+ if (!bound_any)
+ goto cleanup;
+ ret = 0;
if (ai_list != NULL)
freeaddrinfo(ai_list);