Merge pull request erlang#9543 from diodechain/fix_gethostbyname_gnoring_erl_inetrc OTP-19555

Bugfix: gethostbyname fails to respect ERL_INETRC on first call during initialization on linux

Author: RaimoNiskanen

lib/kernel/src/inet_config.erl

@@ -58,36 +58,6 @@ init() ->
     OsType = os:type(),
     do_load_resolv(OsType, erl_dist_mode()),
 
-    case OsType of
-	{unix,Type} ->
-	    if Type =:= linux ->
-		    %% It may be the case that the domain name was not set
-		    %% because the hostname was short. But NOW we can look it
-		    %% up and get the long name and the domain name from it.
-		    
-		    %% FIXME: The second call to set_hostname will insert
-		    %% a duplicate entry in the search list.
-		    
-		    case inet_db:res_option(domain) of
-			"" ->
-			    case inet:gethostbyname(inet_db:gethostname()) of
-				{ok,#hostent{h_name = []}} ->
-				    ok;
-				{ok,#hostent{h_name = HostName}} ->
-				    set_hostname({ok,HostName});
-				_ ->
-				    ok
-			    end;
-			_ ->
-			    ok
-		    end;
-	       true -> ok
-	    end,    
-	    add_dns_lookup(inet_db:res_option(lookup));
-	_ ->
-	    ok
-    end,
-
     %% Read inetrc file, if it exists.
     {RcFile,CfgFiles,CfgList} = read_rc(),
 
@@ -133,6 +103,36 @@ init() ->
 		_ -> ok
 	    end;
 	_ -> ok
+    end, 
+
+    case OsType of
+	{unix,Type} ->
+	    if Type =:= linux ->
+		    %% It may be the case that the domain name was not set
+		    %% because the hostname was short. But NOW we can look it
+		    %% up and get the long name and the domain name from it.
+		    
+		    %% FIXME: The second call to set_hostname will insert
+		    %% a duplicate entry in the search list.
+		    
+		    case inet_db:res_option(domain) of
+			"" ->
+			    case inet:gethostbyname(inet_db:gethostname()) of
+				{ok,#hostent{h_name = []}} ->
+				    ok;
+				{ok,#hostent{h_name = HostName}} ->
+				    set_hostname({ok,HostName});
+				_ ->
+				    ok
+			    end;
+			_ ->
+			    ok
+		    end;
+	       true -> ok
+	    end,    
+	    add_dns_lookup(inet_db:res_option(lookup));
+	_ ->
+	    ok
     end.