[patch] make erlang read nsswitch.conf

resolv.patch (text/plain), 1.25 KB, created by Claes Wikstrom on 2003-06-14 16:46:25 UTC

diff -Naur otp_src_R9B-1.orig/lib/kernel/src/inet_config.erl otp_src_R9B-1/lib/kernel/src/inet_config.erl
--- otp_src_R9B-1.orig/lib/kernel/src/inet_config.erl	2003-06-15 01:42:55.000000000 +0200
+++ otp_src_R9B-1/lib/kernel/src/inet_config.erl	2002-10-09 16:39:22.000000000 +0200
@@ -82,13 +82,8 @@
 		'bsd/os' ->
 		    load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos);
 		linux ->
-		    case load_resolv(filename:join(Etc,"host.conf"),host_conf_linux) of
-			ok ->
-			    ok;
-			_Other ->
-			    load_resolv(filename:join(Etc,"nsswitch.conf"), nsswitch_conf)
-		    end,
-		    
+		    load_resolv(filename:join(Etc,"host.conf"),host_conf_linux),
+
 		    % It may be the case that the domain name was not set
 		    % because the hostname was short. But we can now look it
 		    % up and get the long name and the domain name from it.
@@ -301,12 +296,10 @@
 	    case apply(inet_parse, Func, [File,{chars,Bin}]) of
 		{ok, Ls} -> inet_db:add_rc_list(Ls);
 		{error, Reason} ->
-		    error("parse error in file ~s: ~p", [File, Reason]),
-		    {error, Reason}
+		    error("parse error in file ~s: ~p", [File, Reason])
 	    end;
 	Error ->
-	    warning("file not found ~s~n", [File]),
-	    Error
+	    warning("file not found ~s~n", [File])
     end.
 
 %%