Revert "HADOOP-12687. SecureUtil#QualifiedHostResolver#getByName should also try to resolve direct hostname (Sunil G via rohithsharmaks)"
This reverts commit2b252844e0
. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt (cherry picked from commited18527e38
)
This commit is contained in:
parent
2cbbf76c3d
commit
20bb5c403e
|
@ -20,10 +20,6 @@ Release 2.9.0 - UNRELEASED
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
||||||
HADOOP-12687. SecureUtil#QualifiedHostResolver#getByName should also try to
|
|
||||||
resolve direct hostname, incase multiple loopback addresses are present in
|
|
||||||
/etc/hosts (Sunil G via rohithsharmaks)
|
|
||||||
|
|
||||||
HADOOP-12655. TestHttpServer.testBindAddress bind port range is wider
|
HADOOP-12655. TestHttpServer.testBindAddress bind port range is wider
|
||||||
than expected. (Wei-Chiu Chuang via stevel)
|
than expected. (Wei-Chiu Chuang via stevel)
|
||||||
|
|
||||||
|
|
|
@ -580,14 +580,8 @@ public class SecurityUtil {
|
||||||
addr = getByNameWithSearch(host);
|
addr = getByNameWithSearch(host);
|
||||||
if (addr == null) {
|
if (addr == null) {
|
||||||
addr = getByExactName(host);
|
addr = getByExactName(host);
|
||||||
// If multiple loopback addresses are present, a direct lookup
|
|
||||||
// will be helpful
|
|
||||||
if (addr == null) {
|
|
||||||
addr = InetAddress.getByName(host);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// unresolvable!
|
// unresolvable!
|
||||||
if (addr == null) {
|
if (addr == null) {
|
||||||
|
|
Loading…
Reference in New Issue