Support static_modules in mod_blocking, configure, pres_counter, register, shared_ros...

diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
index bcbb12973d4a0e5b47e6d76e5b9aee8a346a0012..447b7396d384b61fc24be5952adb6b0ac222436c 100644 (file)
--- a/src/mod_blocking.erl
+++ b/src/mod_blocking.erl
@@ -38,8 +38,9 @@
 -include_lib("exmpp/include/exmpp.hrl").
 -include("mod_privacy.hrl").
 
-start(Host, Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, Opts) ->
     IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
     ejabberd_hooks:add(privacy_iq_get, HostB,
                       ?MODULE, process_iq_get, 40),

diff --git a/src/mod_configure.erl b/src/mod_configure.erl
index 4f436649bd83b8b12d30954c52c452eb0310d744..3fced95a3b1df8a727116bd343b67a36a0f420cf 100644 (file)
--- a/src/mod_configure.erl
+++ b/src/mod_configure.erl
@@ -56,8 +56,9 @@
 %% Copied from ejabberd_sm.erl
 -record(session, {sid, usr, us, priority, info}).
 
-start(Host, _Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, _Opts) ->
     ejabberd_hooks:add(disco_local_items, HostB, ?MODULE, get_local_items, 50),
     ejabberd_hooks:add(disco_local_features, HostB, ?MODULE, get_local_features, 50),
     ejabberd_hooks:add(disco_local_identity, HostB, ?MODULE, get_local_identity, 50),

diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl
index c062ef0606b741434c79ddd757e8d9c4552e1293..75052420ddefce57592deb8e28b41b4c6ec71de0 100644 (file)
--- a/src/mod_pres_counter.erl
+++ b/src/mod_pres_counter.erl
@@ -37,8 +37,9 @@
 
 -record(pres_counter, {dir, start, count, logged = false}).
 
-start(Host, _Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, _Opts) ->
     ejabberd_hooks:add(privacy_check_packet, HostB,
                        ?MODULE, check_packet, 25),
     ok.

diff --git a/src/mod_register.erl b/src/mod_register.erl
index e7f51bb31e88bc0b97fce08559b16aef440da913..a5d142b536a23f648800b2cca1057368e32ee4e5 100644 (file)
--- a/src/mod_register.erl
+++ b/src/mod_register.erl
@@ -40,8 +40,9 @@
 
 -include("ejabberd.hrl").
 
-start(Host, Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, Opts) ->
     IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
     gen_iq_handler:add_iq_handler(ejabberd_local, HostB, ?NS_INBAND_REGISTER,
                                  ?MODULE, process_iq, IQDisc),

diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
index 670745c7dbaaf59e1948fc93bb04de8fc9567b1a..bc9c2fd88829fbf64bfdc0ec38d4aab0973f5d5e 100644 (file)
--- a/src/mod_shared_roster.erl
+++ b/src/mod_shared_roster.erl
@@ -63,8 +63,9 @@
 -record(sr_group, {group_host, opts}).
 -record(sr_user, {us, group_host}).
 
-start(Host, _Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, _Opts) ->
     mnesia:create_table(sr_group,
                        [{disc_copies, [node()]},
                         {attributes, record_info(fields, sr_group)}]),

diff --git a/src/mod_sic.erl b/src/mod_sic.erl
index 39c45d87b880a73dad85879380a6cc28ac3a5ee0..86689acb1a0895ed378c91224d947a4a9aa49e78 100644 (file)
--- a/src/mod_sic.erl
+++ b/src/mod_sic.erl
@@ -38,8 +38,9 @@
 -include_lib("exmpp/include/exmpp_jid.hrl").
 -include("ejabberd.hrl").
 
-start(Host, Opts) ->
-    HostB = list_to_binary(Host),
+start(Host, Opts) when is_list(Host) ->
+    start(list_to_binary(Host), Opts);
+start(HostB, Opts) ->
     IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
     mod_disco:register_feature(HostB, ?NS_SIC_0_s),
     gen_iq_handler:add_iq_handler(ejabberd_local, HostB, ?NS_SIC_0_s,