From: Joshua Colp <jcolp@digium.com>
Date: Wed, 19 Sep 2007 13:21:41 +0000 (+0000)
Subject: Merged revisions 83070 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1380
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd1cde1a166d4a06973fb8d161558add8eeb863b;p=thirdparty%2Fasterisk.git

Merged revisions 83070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r83070 | file | 2007-09-19 10:18:22 -0300 (Wed, 19 Sep 2007) | 6 lines

(closes issue #10760)
Reported by: dimas
Patches:
      chan_sip.patch uploaded by dimas (license 88)
Read in subscribecontext option in general to be the default.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 09a5dc1706..e7464253a0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -17921,7 +17921,9 @@ static int reload_config(enum channelreloadreason reason)
 		/* Create the dialogs list */
 		if (!strcasecmp(v->name, "context")) {
 			ast_copy_string(default_context, v->value, sizeof(default_context));
-		} else if (!strcasecmp(v->name, "allowguest")) {
+		} else if (!strcasecmp(v->name, "subscribecontext")) {
+			ast_copy_string(default_subscribecontext, v->value, sizeof(default_subscribecontext));
+  		} else if (!strcasecmp(v->name, "allowguest")) {
 			global_allowguest = ast_true(v->value) ? 1 : 0;
 		} else if (!strcasecmp(v->name, "realm")) {
 			ast_copy_string(global_realm, v->value, sizeof(global_realm));