diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-08-20 21:01:59 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-08-20 21:01:59 +0000 |
| commit | 5caa938be22340202b114ec929207bbb89550a0b (patch) | |
| tree | e7776190a80338063683cb4d4edbb9de5533799f /res/res_pjsip/pjsip_configuration.c | |
| parent | b6faaf85e36695fddd4f2c968f55c23f118ed307 (diff) | |
Localize and rename ACL configuration.
This is more-or-less a reversion of previous ACL behavior so that
it is more self-contained. ACL sections are now only parsed if res_pjsip_acl.so
is loaded. Moreover, the configuration section is now "type=acl" instead of
"type=security".
The original reason for having ACLs configured in a "type=security" section
was to lump ACLs and other security-related items into the same section. The
problem is that ACLs really should be in their own sections and there are
no other security-related options implemented anyways.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397193 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip/pjsip_configuration.c')
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 4d703e54b..527df5da3 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -740,13 +740,6 @@ int ast_res_pjsip_initialize_configuration(void) return -1; } - if (ast_sip_initialize_sorcery_security(sip_sorcery)) { - ast_log(LOG_ERROR, "Failed to register SIP security support\n"); - ast_sorcery_unref(sip_sorcery); - sip_sorcery = NULL; - return -1; - } - if (ast_sip_initialize_sorcery_global(sip_sorcery)) { ast_log(LOG_ERROR, "Failed to register SIP Global support\n"); ast_sorcery_unref(sip_sorcery); |