Author: bebuild
Date: Thu Nov 20 10:56:16 2014
New Revision: 428438
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=428438
Log:
Merge r428333 for AST-2014-013
Modified:
tags/12.7.1/ (props changed)
tags/12.7.1/ChangeLog
tags/12.7.1/res/res_pjsip_acl.c
Propchange: tags/12.7.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 20 10:56:16 2014
@@ -1,1 +1,1 @@
-/branches/12:427382,428409,428422
+/branches/12:427382,428333,428409,428422
Modified: tags/12.7.1/ChangeLog
URL:
http://svnview.digium.com/svn/asterisk/tags/12.7.1/ChangeLog?view=diff&rev=428438&r1=428437&r2=428438
==============================================================================
--- tags/12.7.1/ChangeLog (original)
+++ tags/12.7.1/ChangeLog Thu Nov 20 10:56:16 2014
@@ -10,6 +10,17 @@
ASTERISK-24469 #close
Reported by Matt Jordan
+
+ * AST-2014-013: Fix PJSIP ACLs not loading on startup and apply/ACL
+ issues on contact
+
+ The biggest problem this patch fixes is that ACLs weren't previously
+ being loaded when the res_pjsip_acl module was loaded. In addition,
+ the ACL options contact_permit and contact_acl were effectively
+ interpreted as contact_deny and this patch fixes that as well.
+
+ ASTERISK-24531 #close
+ Reported by: Matt Jordan
* AST-2014-018 - func_db: DB Dialplan function permission escalation
via AMI.
Modified: tags/12.7.1/res/res_pjsip_acl.c
URL:
http://svnview.digium.com/svn/asterisk/tags/12.7.1/res/res_pjsip_acl.c?view=diff&rev=428438&r1=428437&r2=428438
==============================================================================
--- tags/12.7.1/res/res_pjsip_acl.c (original)
+++ tags/12.7.1/res/res_pjsip_acl.c Thu Nov 20 10:56:16 2014
@@ -233,8 +233,9 @@
struct ast_sip_acl *sip_acl = obj;
int error = 0;
int ignore;
- if (!strncmp(var->name, "contact", 7)) {
- ast_append_acl(var->name + 7, var->value,
&sip_acl->contact_acl, &error, &ignore);
+
+ if (!strncmp(var->name, "contact_", 8)) {
+ ast_append_acl(var->name + 8, var->value,
&sip_acl->contact_acl, &error, &ignore);
} else {
ast_append_acl(var->name, var->value, &sip_acl->acl, &error,
&ignore);
}
@@ -287,6 +288,8 @@
ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(),
SIP_SORCERY_ACL_TYPE, "contact_deny", "", acl_handler, NULL, NULL, 0, 0);
ast_sorcery_object_field_register_custom(ast_sip_get_sorcery(),
SIP_SORCERY_ACL_TYPE, "contact_acl", "", acl_handler, NULL, NULL, 0, 0);
+ ast_sorcery_load_object(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE);
+
ast_sip_register_service(&acl_module);
return AST_MODULE_LOAD_SUCCESS;
}
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
