From: Kevin P. Fleming Date: Sun, 15 Nov 2009 17:23:50 +0000 (+0000) Subject: Merged revisions 230247 via svnmerge from X-Git-Tag: 1.6.0.20-rc1~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67f257a0671a853b8bbf3831905dce92e586e03a;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@230248 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 27f8590fb3..07ca4b4c90 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. */