Ensure all calls to getaddrinfo are headed by a block_dns check.
If block_dns is set, call getaddrinfo with AI_NUMERICHOST set and AI_CANONNAME clear. Some paths may not have set AI_CANONNAME, but it's easier to audit this way when the getaddrinfo prelude is uniform across call sites, and the compiler can optimize it away.
This commit is contained in:

committed by
Nico Williams

parent
fa4c4430f6
commit
fd77c4000d
@@ -70,6 +70,11 @@ connect_to_master (krb5_context context, const char *master,
|
||||
port_str = port;
|
||||
}
|
||||
|
||||
if (krb5_config_get_bool(context, NULL, "libdefaults", "block_dns",
|
||||
NULL)) {
|
||||
hints.ai_flags &= ~AI_CANONNAME;
|
||||
hints.ai_flags |= AI_NUMERICHOST;
|
||||
}
|
||||
error = getaddrinfo(master, port_str, &hints, &ai);
|
||||
if (error) {
|
||||
krb5_warnx(context, "Failed to get address of to %s: %s",
|
||||
|
Reference in New Issue
Block a user