diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_app.erl | 1 | ||||
| -rw-r--r-- | src/ejabberd_config.erl | 22 | ||||
| -rw-r--r-- | src/ejabberd_service.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_sup.erl | 9 | ||||
| -rw-r--r-- | src/stringprep/Makefile.in | 3 | ||||
| -rw-r--r-- | src/stringprep/Makefile.win32 | 7 |
6 files changed, 30 insertions, 14 deletions
diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index dc1f4f58c..8a08c0ce3 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -23,6 +23,7 @@ start(normal, _Args) -> db_init(), sha:start(), catch ssl:start(), + stringprep_sup:start_link(), translate:start(), acl:start(), ejabberd_ctl:init(), diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl index 28c070af5..a44c9378f 100644 --- a/src/ejabberd_config.erl +++ b/src/ejabberd_config.erl @@ -63,7 +63,7 @@ search_hosts(Term, State) -> {host, Host} -> if State#state.hosts == [] -> - add_option(hosts, [Host], State#state{hosts = [Host]}); + add_hosts_to_option([Host], State); true -> ?ERROR_MSG("Can't load config file: " "too many hosts definitions", []), @@ -72,7 +72,7 @@ search_hosts(Term, State) -> {hosts, Hosts} -> if State#state.hosts == [] -> - add_option(hosts, Hosts, State#state{hosts = Hosts}); + add_hosts_to_option(Hosts, State); true -> ?ERROR_MSG("Can't load config file: " "too many hosts definitions", []), @@ -82,6 +82,24 @@ search_hosts(Term, State) -> State end. +add_hosts_to_option(Hosts, State) -> + PrepHosts = normalize_hosts(Hosts), + add_option(hosts, PrepHosts, State#state{hosts = PrepHosts}). + +normalize_hosts(Hosts) -> + normalize_hosts(Hosts,[]). +normalize_hosts([], PrepHosts) -> + lists:reverse(PrepHosts); +normalize_hosts([Host|Hosts], PrepHosts) -> + case jlib:nodeprep(Host) of + error -> + ?ERROR_MSG("Can't load config file: " + "invalid host name [~p]", [Host]), + exit("invalid hostname"); + PrepHost -> + normalize_hosts(Hosts, [PrepHost|PrepHosts]) + end. + process_term(Term, State) -> case Term of override_global -> diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl index 7d866f6f1..06bd50b4b 100644 --- a/src/ejabberd_service.erl +++ b/src/ejabberd_service.erl @@ -37,7 +37,7 @@ hosts, password, access, check_from}). -%-Define(DBGFSM, true). +%-define(DBGFSM, true). -ifdef(DBGFSM). -define(FSMOPTS, [{debug, [trace]}]). diff --git a/src/ejabberd_sup.erl b/src/ejabberd_sup.erl index af2c16f8f..074b12eed 100644 --- a/src/ejabberd_sup.erl +++ b/src/ejabberd_sup.erl @@ -17,7 +17,6 @@ start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []). - init([]) -> Hooks = {ejabberd_hooks, @@ -26,13 +25,6 @@ init([]) -> brutal_kill, worker, [ejabberd_hooks]}, - StringPrep = - {stringprep, - {stringprep, start_link, []}, - permanent, - brutal_kill, - worker, - [stringprep]}, NodeGroups = {ejabberd_node_groups, {ejabberd_node_groups, start_link, []}, @@ -155,7 +147,6 @@ init([]) -> [ejabberd_tmp_sup]}, {ok, {{one_for_one, 10, 1}, [Hooks, - StringPrep, NodeGroups, SystemMonitor, Router, diff --git a/src/stringprep/Makefile.in b/src/stringprep/Makefile.in index e44f8c96a..5de176bd7 100644 --- a/src/stringprep/Makefile.in +++ b/src/stringprep/Makefile.in @@ -25,7 +25,8 @@ ifdef debug endif OBJS = \ - $(OUTDIR)/stringprep.beam + $(OUTDIR)/stringprep.beam \ + $(OUTDIR)/stringprep_sup.beam all: $(OBJS) $(ERLSHLIBS) diff --git a/src/stringprep/Makefile.win32 b/src/stringprep/Makefile.win32 index 37e806a1a..03d7a3dd5 100644 --- a/src/stringprep/Makefile.win32 +++ b/src/stringprep/Makefile.win32 @@ -9,7 +9,8 @@ AUXIL = uni_data.c uni_norm.c OBJECT = stringprep_drv.o DLL = $(OUTDIR)\stringprep_drv.dll -ALL : $(DLL) $(OUTDIR)\stringprep.beam +ALL : $(DLL) $(OUTDIR)\stringprep.beam \ + $(OUTDIR)\stringprep_sup.beam CLEAN : -@erase $(DLL) @@ -17,10 +18,14 @@ CLEAN : -@erase $(OUTDIR)\stringprep_drv.lib -@erase $(OBJECT) -@erase $(OUTDIR)\stringprep.beam + -@erase $(OUTDIR)\stringprep_sup.beam $(OUTDIR)\stringprep.beam : stringprep.erl erlc -W $(EFLAGS) -o $(OUTDIR) stringprep.erl +$(OUTDIR)\stringprep_sup.beam : stringprep_sup.erl + erlc -W $(EFLAGS) -o $(OUTDIR) stringprep_sup.erl + CC=cl.exe CC_FLAGS=-nologo -D__WIN32__ -DWIN32 -DWINDOWS -D_WIN32 -DNT -MD -Ox -I"$(ERLANG_DIR)\usr\include" -I"$(EI_DIR)\include" |