From: Joshua Colp <jcolp@digium.com>
Date: Tue, 16 Jan 2007 05:55:23 +0000 (+0000)
Subject: Merged revisions 51085 via svnmerge from
X-Git-Tag: 1.4.1~277
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=531d008066476e62e1db7ed30ac4eb6ae7c48388;p=thirdparty%2Fasterisk.git

Merged revisions 51085 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51085 | file | 2007-01-16 00:53:31 -0500 (Tue, 16 Jan 2007) | 2 lines

Add none as a valid callgroup/pickupgroup option. I consider it a bug that it would inherit it all the way down and not have any way to reset it to nothing - so that's why it is in 1.2. (issue #8296 reported by gkloepfer)

........


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f3d9359ce6..0208f54f09 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10603,9 +10603,15 @@ static int process_zap(struct ast_variable *v, int reload, int skipchannels)
 		} else if (!strcasecmp(v->name, "group")) {
 			cur_group = ast_get_group(v->value);
 		} else if (!strcasecmp(v->name, "callgroup")) {
-			cur_callergroup = ast_get_group(v->value);
+			if (!strcasecmp(v->value, "none"))
+				cur_callergroup = 0;
+			else
+				cur_callergroup = ast_get_group(v->value);
 		} else if (!strcasecmp(v->name, "pickupgroup")) {
-			cur_pickupgroup = ast_get_group(v->value);
+			if (!strcasecmp(v->value, "none"))
+				cur_pickupgroup = 0;
+			else
+				cur_pickupgroup = ast_get_group(v->value);
 		} else if (!strcasecmp(v->name, "immediate")) {
 			immediate = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "transfertobusy")) {