From: David Vossel Date: Tue, 10 Nov 2009 17:53:25 +0000 (+0000) Subject: Merged revisions 229168 via svnmerge from X-Git-Tag: 1.6.1.10-rc3~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a362e93d356b16542c9d88966ac3f1faf423e684;p=thirdparty%2Fasterisk.git Merged revisions 229168 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r229168 | dvossel | 2009-11-10 11:16:49 -0600 (Tue, 10 Nov 2009) | 15 lines Merged revisions 229167 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r229167 | dvossel | 2009-11-10 11:15:57 -0600 (Tue, 10 Nov 2009) | 9 lines don't crash on log message in solaris AST-2009-006 (closes issue #16206) Reported by: bklang Tested by: bklang ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@229233 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index bdc5066117..30a709534d 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4597,7 +4597,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), ies->username); + 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")); goto reject; } return 0; /* calltoken is not required for this addr, so permit it. */