diff options
author | Jonathan Rose <jrose@digium.com> | 2013-05-17 17:36:10 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2013-05-17 17:36:10 +0000 |
commit | b90bba7a303bf57c3c874a1c8f506d39d4e78a9c (patch) | |
tree | 56e6ca0d885b1e9e11856a6be44b4b92582f5606 /main/asterisk.c | |
parent | 15945a7185187a3d79c7c7247a297bf92b49c139 (diff) |
Stasis: Update security events to use Stasis
Also moves ACL messages to the security topic and gets rid of the
ACL topic
(closes issue ASTERISK-21103)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2496/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/asterisk.c')
-rw-r--r-- | main/asterisk.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 9308230fb..933aae63d 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -242,6 +242,7 @@ int daemon(int, int); /* defined in libresolv of all places */ #include "asterisk/sorcery.h" #include "asterisk/stasis.h" #include "asterisk/json.h" +#include "asterisk/security_events.h" #include "asterisk/stasis_endpoints.h" #include "../defaults.h" @@ -4263,6 +4264,12 @@ int main(int argc, char *argv[]) exit(1); } + if (ast_security_stasis_init()) { /* Initialize Security Stasis Topic and Events */ + ast_security_stasis_cleanup(); + printf("%s", term_quit()); + exit(1); + } + if (ast_named_acl_init()) { /* Initialize the Named ACL system */ printf("%s", term_quit()); exit(1); |