[svn-commits] gtjoseph: trunk r432035 - in /trunk: ./ res/

[SVN commits to the Digium repositories]

Author: gtjoseph
Date: Fri Feb 20 11:53:33 2015
New Revision: 432035

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=432035
Log:
ASTERISK-24811: Add ast_sorcery_apply_config() to res_pjsip_publish_asterisk.

Matt Hoskins reported that res_pjsip_publish_asterisk wouldn't pull config from 
realtime.  Turns out it was just missing a call ast_sorcery_apply_config().

res_pjsip_acl was missing it as well, so I added it.  The other pjsip modules 
looked OK.

ASTERISK-24811 #close
Reported-by: Matt Hoskins
Tested-by: George Joseph
Tested-by: Matt Hoskins
patches:
	res_pjsip_publish_asterisk.c.patch submitted by Matt Hoskins (license 6688)

Review: https://reviewboard.asterisk.org/r/4433/
........

Merged revisions 432033 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_acl.c
    trunk/res/res_pjsip_publish_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_acl.c?view=diff&rev=432035&r1=432034&r2=432035
==============================================================================
--- trunk/res/res_pjsip_acl.c (original)
+++ trunk/res/res_pjsip_acl.c Fri Feb 20 11:53:33 2015
@@ -269,6 +269,7 @@
 {
 	CHECK_PJSIP_MODULE_LOADED();
 
+	ast_sorcery_apply_config(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE);
 	ast_sorcery_apply_default(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE,
 				  "config", "pjsip.conf,criteria=type=acl");
 

Modified: trunk/res/res_pjsip_publish_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_publish_asterisk.c?view=diff&rev=432035&r1=432034&r2=432035
==============================================================================
--- trunk/res/res_pjsip_publish_asterisk.c (original)
+++ trunk/res/res_pjsip_publish_asterisk.c Fri Feb 20 11:53:33 2015
@@ -858,6 +858,7 @@
 {
 	CHECK_PJSIP_PUBSUB_MODULE_LOADED();
 
+	ast_sorcery_apply_config(ast_sip_get_sorcery(), "asterisk-publication");
 	ast_sorcery_apply_default(ast_sip_get_sorcery(), "asterisk-publication", "config", "pjsip.conf,criteria=type=asterisk-publication");
 
 	if (ast_sorcery_object_register(ast_sip_get_sorcery(), "asterisk-publication", asterisk_publication_config_alloc, NULL, NULL)) {