diff options
author | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
---|---|---|
committer | Mickael Remond <mremond@process-one.net> | 2016-04-12 10:34:24 +0200 |
commit | cd2e2b1a880f93b7198bbc17cb1d9be2c23048e8 (patch) | |
tree | ce38fa8eac3e4540e4792d39f059f6f04a4fab9b /src/ejabberd_sm.erl | |
parent | Allow testing user pattern directly in access rules (diff) |
Synchronizing master changes
Diffstat (limited to 'src/ejabberd_sm.erl')
-rw-r--r-- | src/ejabberd_sm.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl index 4f7cfeeaa..7ab0a5f78 100644 --- a/src/ejabberd_sm.erl +++ b/src/ejabberd_sm.erl @@ -66,7 +66,8 @@ get_max_user_sessions/2, get_all_pids/0, is_existing_resource/3, - get_commands_spec/0 + get_commands_spec/0, + make_sid/0 ]). -export([init/1, handle_call/3, handle_cast/2, @@ -806,6 +807,9 @@ kick_user(User, Server) -> end, Resources), length(Resources). +make_sid() -> + {p1_time_compat:unique_timestamp(), self()}. + opt_type(sm_db_type) -> fun (mnesia) -> mnesia; (internal) -> mnesia; |