automerge commit

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 277a152c1d6323110d22ec006cdbef6464dd485b..73cc62741c6663d6b9e06d77136a390e634104e5 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10440,9 +10440,15 @@ static int setup_zap(int reload)
                } 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")) {