* src/ejabberd_auth.erl: Update from ctl to commands (EJAB-694)

* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise

SVN Revision: 1638

diff --git a/ChangeLog b/ChangeLog
index 29e933c93ef66810a239a505108288ea095964ea..760e4ff3b3c0d787b32654f9f09cba4e978950a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-10-12  Badlop  <badlop@process-one.net>
 
+       * src/ejabberd_auth.erl: Update from ctl to commands (EJAB-694)
+       * src/ejabberd_auth_internal.erl: Likewise
+       * src/ejabberd_auth_ldap.erl: Likewise
+       * src/ejabberd_auth_odbc.erl: Likewise
+
        * src/ejabberdctl.template: Move help print to a separate
        function (EJAB-694)
 

diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index be48bcff2f6cc58e911e708ab11b7afe5eb0483c..db37e26ac98787d373021864221b16212d69050c 100644 (file)
--- a/src/ejabberd_auth.erl
+++ b/src/ejabberd_auth.erl
@@ -49,14 +49,12 @@
         is_user_exists_in_other_modules/3,
         remove_user/2,
         remove_user/3,
-        plain_password_required/1,
-        ctl_process_get_registered/3
+        plain_password_required/1
        ]).
 
 -export([auth_modules/1]).
 
 -include("ejabberd.hrl").
--include("ejabberd_ctl.hrl").
 
 %%%----------------------------------------------------------------------
 %%% API
@@ -265,15 +263,6 @@ remove_user(User, Server, Password) ->
              M:remove_user(User, Server, Password)
       end, auth_modules(Server)).
 
-ctl_process_get_registered(_Val, Host, ["registered-users"]) ->
-    Users = ejabberd_auth:get_vh_registered_users(Host),
-    NewLine = io_lib:format("~n", []),
-    SUsers = lists:sort(Users),
-    FUsers = lists:map(fun({U, _S}) -> [U, NewLine] end, SUsers),
-    ?PRINT("~s", [FUsers]),
-    {stop, ?STATUS_SUCCESS};
-ctl_process_get_registered(Val, _Host, _Args) ->
-    Val.
 
 %%%----------------------------------------------------------------------
 %%% Internal functions

diff --git a/src/ejabberd_auth_internal.erl b/src/ejabberd_auth_internal.erl
index e752695a96bee832d9db20c169a02cb4cd76b697..7d6a8e8f81357c491a8d289a47a5f50822bd8ad5 100644 (file)
--- a/src/ejabberd_auth_internal.erl
+++ b/src/ejabberd_auth_internal.erl
@@ -53,14 +53,10 @@
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
-start(Host) ->
+start(_Host) ->
     mnesia:create_table(passwd, [{disc_copies, [node()]},
                                 {attributes, record_info(fields, passwd)}]),
     update_table(),
-    ejabberd_ctl:register_commands(
-      Host,
-      [{"registered-users", "list all registered users"}],
-      ejabberd_auth, ctl_process_get_registered),
     ok.
 
 plain_password_required() ->

diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl
index 9adb5c696b1b28efa677bdca62055d02acbe76ff..961faec56ac579e79a1ad1da0ac532c545e110e8 100644 (file)
--- a/src/ejabberd_auth_ldap.erl
+++ b/src/ejabberd_auth_ldap.erl
@@ -112,11 +112,8 @@ start_link(Host) ->
     Proc = gen_mod:get_module_proc(Host, ?MODULE),
     gen_server:start_link({local, Proc}, ?MODULE, Host, []).
 
-terminate(_Reason, State) ->
-    ejabberd_ctl:unregister_commands(
-      State#state.host,
-      [{"registered-users", "list all registered users"}],
-      ejabberd_auth, ctl_process_get_registered).
+terminate(_Reason, _State) ->
+    ok.
 
 init(Host) ->
     State = parse_options(Host),
@@ -132,10 +129,6 @@ init(Host) ->
                     State#state.port,
                     State#state.dn,
                     State#state.password),
-    ejabberd_ctl:register_commands(
-      Host,
-      [{"registered-users", "list all registered users"}],
-      ejabberd_auth, ctl_process_get_registered),
     {ok, State}.
 
 plain_password_required() ->

diff --git a/src/ejabberd_auth_odbc.erl b/src/ejabberd_auth_odbc.erl
index 487fe146dae873ab2bc2d6cca06ed73233344d13..6f73e6a9c0056bbdace0f4b43033c8ac291c9cfb 100644 (file)
--- a/src/ejabberd_auth_odbc.erl
+++ b/src/ejabberd_auth_odbc.erl
@@ -51,11 +51,7 @@
 %%%----------------------------------------------------------------------
 %%% API
 %%%----------------------------------------------------------------------
-start(Host) ->
-    ejabberd_ctl:register_commands(
-      Host,
-      [{"registered-users", "list all registered users"}],
-      ejabberd_auth, ctl_process_get_registered),
+start(_Host) ->
     ok.
 
 plain_password_required() ->