aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-15 17:23:50 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2009-11-15 17:23:50 +0000
commit072c37f0fb7c5f75db00581815a6f40e2f5200fc (patch)
tree39e7f788aad1b6658c1a7a6e734152645582f9f2 /channels
parenteb5c6dde76632ae3154ca00d27ff65865e6a4768 (diff)
Merged revisions 230247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r230247 | kpfleming | 2009-11-15 11:23:02 -0600 (Sun, 15 Nov 2009) | 12 lines Merged revisions 230246 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r230246 | kpfleming | 2009-11-15 11:19:06 -0600 (Sun, 15 Nov 2009) | 6 lines Correct mistaken option name in error message. The configuration option for allowing hosts to make non-token-based calls is 'calltokenoptional', not 'calltokenignore'. (reported on asterisk-users) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@230248 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 27f8590fb..07ca4b4c9 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4542,7 +4542,7 @@ static int handle_call_token(struct ast_iax2_full_hdr *fh, struct iax_ies *ies,
/* ----- Case 3 ----- */
} else { /* calltokens are not supported for this client, how do we respond? */
if (calltoken_required(sin, ies->username, subclass)) {
- ast_log(LOG_ERROR, "Call rejected, CallToken Support required. If unexpected, resolve by placing address %s in the calltokenignore list or setting user %s requirecalltoken=no\n", ast_inet_ntoa(sin->sin_addr), S_OR(ies->username, "guest"));
+ ast_log(LOG_ERROR, "Call rejected, CallToken Support required. If unexpected, resolve by placing address %s in the calltokenoptional list or setting user %s requirecalltoken=no\n", ast_inet_ntoa(sin->sin_addr), S_OR(ies->username, "guest"));
goto reject;
}
return 0; /* calltoken is not required for this addr, so permit it. */