[asterisk-commits] mmichelson: branch mmichelson/bridged_channel r395825 - in /team/mmichelson/b...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jul 30 17:48:18 2013
New Revision: 395825

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395825
Log:
Get branch up to date so I can put it up for review.


Modified:
    team/mmichelson/bridged_channel/   (props changed)
    team/mmichelson/bridged_channel/res/res_pjsip_endpoint_identifier_ip.c

Propchange: team/mmichelson/bridged_channel/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 30 17:48:18 2013
@@ -1,1 +1,1 @@
-/trunk:1-395814
+/trunk:1-395824

Modified: team/mmichelson/bridged_channel/res/res_pjsip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/bridged_channel/res/res_pjsip_endpoint_identifier_ip.c?view=diff&rev=395825&r1=395824&r2=395825
==============================================================================
--- team/mmichelson/bridged_channel/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ team/mmichelson/bridged_channel/res/res_pjsip_endpoint_identifier_ip.c Tue Jul 30 17:48:18 2013
@@ -33,7 +33,7 @@
 /*** DOCUMENTATION
 	<configInfo name="res_pjsip_endpoint_identifier_ip" language="en_US">
 		<synopsis>Module that identifies endpoints via source IP address</synopsis>
-		<configFile name="res_pjsip.conf">
+		<configFile name="pjsip.conf">
 			<configObject name="identify">
 				<configOption name="endpoint">
 					<synopsis>Name of Endpoint</synopsis>
@@ -135,7 +135,7 @@
 
 static int load_module(void)
 {
-	ast_sorcery_apply_default(ast_sip_get_sorcery(), "identify", "config", "res_pjsip.conf,criteria=type=identify");
+	ast_sorcery_apply_default(ast_sip_get_sorcery(), "identify", "config", "pjsip.conf,criteria=type=identify");
 
 	if (ast_sorcery_object_register(ast_sip_get_sorcery(), "identify", ip_identify_alloc, NULL, NULL)) {
 		return AST_MODULE_LOAD_DECLINE;