diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-03 23:46:09 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-03 23:46:09 +0000 |
| commit | 4b47c8ba4172fc6ddd6a48e690b65a20930fdd43 (patch) | |
| tree | 9ffc990fdd01dfc2f1954ca5db01aabb4b0af8c4 /channels | |
| parent | 6e02cf8b96c03ec5f79bc77d76e56193c87a5670 (diff) | |
Fix allow/disallow nomenclature (bug #2945, part deux)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4385 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_sip.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index dde707e28..30b5c7864 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8292,9 +8292,9 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v) user->amaflags = format; } } else if (!strcasecmp(v->name, "allow")) { - ast_parse_allow_deny(&user->prefs, &user->capability, v->value, 1); + ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 1); } else if (!strcasecmp(v->name, "disallow")) { - ast_parse_allow_deny(&user->prefs, &user->capability, v->value, 0); + ast_parse_allow_disallow(&user->prefs, &user->capability, v->value, 0); } else if (!strcasecmp(v->name, "insecure")) { user->insecure = ast_true(v->value); } else if (!strcasecmp(v->name, "callingpres")) { @@ -8550,9 +8550,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int } else if (!strcasecmp(v->name, "pickupgroup")) { peer->pickupgroup = ast_get_group(v->value); } else if (!strcasecmp(v->name, "allow")) { - ast_parse_allow_deny(&peer->prefs, &peer->capability, v->value, 1); + ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 1); } else if (!strcasecmp(v->name, "disallow")) { - ast_parse_allow_deny(&peer->prefs, &peer->capability, v->value, 0); + ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 0); } else if (!strcasecmp(v->name, "insecure")) { if (!strcasecmp(v->value, "very")) { peer->insecure = 2; @@ -8826,9 +8826,9 @@ static int reload_config(void) else memcpy(&externip.sin_addr, hp->h_addr, sizeof(externip.sin_addr)); } else if (!strcasecmp(v->name, "allow")) { - ast_parse_allow_deny(&prefs, &global_capability, v->value, 1); + ast_parse_allow_disallow(&prefs, &global_capability, v->value, 1); } else if (!strcasecmp(v->name, "disallow")) { - ast_parse_allow_deny(&prefs, &global_capability, v->value, 0); + ast_parse_allow_disallow(&prefs, &global_capability, v->value, 0); } else if (!strcasecmp(v->name, "register")) { sip_register(v->value, v->lineno); } else if (!strcasecmp(v->name, "recordhistory")) { |