Fix sip_cfg.notifycid to be set with the defined enum values.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 23 Jan 2012 17:36:28 +0000 (17:36 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 23 Jan 2012 17:36:28 +0000 (17:36 +0000)
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
........

Merged revisions 352091 from http://svn.asterisk.org/svn/asterisk/branches/10

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

channels/chan_sip.c

index a503e49..5b2bfa8 100644 (file)
@@ -29005,7 +29005,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);