From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 23 Jan 2012 17:34:59 +0000 (+0000)
Subject: Fix sip_cfg.notifycid to be set with the defined enum values.
X-Git-Tag: 10.2.0-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4b3c15634fb7cba94d92ce390d1259ad428b8fb;p=thirdparty%2Fasterisk.git

Fix sip_cfg.notifycid to be set with the defined enum values.

The invalid value used when notifycid was enabled was benign.  As far as
the code was concerned -1 and 1 are equivalent.

(closes issue ASTERISK-19232)
Reported by: Eike Kuiper
........

Merged revisions 352090 from http://svn.asterisk.org/svn/asterisk/branches/1.8


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5a83878f04..94236331c4 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28872,7 +28872,7 @@ static int reload_config(enum channelreloadreason reason)
 			if (!strcasecmp(v->value, "ignore-context")) {
 				sip_cfg.notifycid = IGNORE_CONTEXT;
 			} else {
-				sip_cfg.notifycid = ast_true(v->value);
+				sip_cfg.notifycid = ast_true(v->value) ? ENABLED : DISABLED;
 			}
 		} else if (!strcasecmp(v->name, "alwaysauthreject")) {
 			sip_cfg.alwaysauthreject = ast_true(v->value);