Restore initialization of security topics

During a merge the security topic initialization got blown away.
This patch restores it.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/78/78/1
Matthew Jordan 13 years ago
parent 861633013d
commit 97c6062dfc

@ -243,6 +243,7 @@ int daemon(int, int); /* defined in libresolv of all places */
#include "asterisk/stasis.h"
#include "asterisk/json.h"
#include "asterisk/stasis_endpoints.h"
#include "asterisk/security_events.h"
#include "../defaults.h"
@ -4322,6 +4323,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);
@ -4382,22 +4389,22 @@ int main(int argc, char *argv[])
exit(1);
}
if (init_manager()) {
if (ast_local_init()) {
printf("%s", term_quit());
exit(1);
}
if (ast_enum_init()) {
if (init_manager()) {
printf("%s", term_quit());
exit(1);
}
if (ast_cc_init()) {
if (ast_enum_init()) {
printf("%s", term_quit());
exit(1);
}
if (ast_local_init()) {
if (ast_cc_init()) {
printf("%s", term_quit());
exit(1);
}

Loading…
Cancel
Save