1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
diff -ru 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 2002-10-09 07:39:22.000000000 -0700
+++ otp_src_R9B-1/lib/kernel/src/inet_config.erl 2003-07-03 17:43:37.000000000 -0700
@@ -82,8 +82,13 @@
'bsd/os' ->
load_resolv(filename:join(Etc,"irs.conf"), host_conf_bsdos);
linux ->
- load_resolv(filename:join(Etc,"host.conf"),host_conf_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,
+
% 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.
@@ -296,10 +301,12 @@
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("parse error in file ~s: ~p", [File, Reason]),
+ {error, Reason}
end;
Error ->
- warning("file not found ~s~n", [File])
+ warning("file not found ~s~n", [File]),
+ Error
end.
%%
diff -ru otp_src_R9B-1-orig/lib/megaco/src/text/Makefile otp_src_R9B-1/lib/megaco/src/text/Makefile
--- otp_src_R9B-1-orig/lib/megaco/src/text/Makefile 2002-11-28 05:50:00.000000000 -0800
+++ otp_src_R9B-1/lib/megaco/src/text/Makefile 2003-07-03 17:44:41.000000000 -0700
@@ -48,10 +48,15 @@
$(INTERNAL_YRL_FILES:%.yrl=%.erl)
BEAM_TARGET_FILES = \
- $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR)) \
$(MODULES:%=$(EBIN)/%.$(EMULATOR))
-TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES)
+YRL_BEAM_TARGET_FILES = \
+ $(INTERNAL_YRL_FILES:%.yrl=$(EBIN)/%.$(EMULATOR))
+
+
+
+TARGET_FILES = $(ERL_TARGET_FILES) $(BEAM_TARGET_FILES) $(YRL_BEAM_TARGETS)
+
# ----------------------------------------------------
|
GitWeb
