summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2009-11-10 17:16:49 +0000
committerDavid Vossel <dvossel@digium.com>2009-11-10 17:16:49 +0000
commit60f80e536061382a6180e7841ce9c384b4a042a3 (patch)
tree6bb91b0bd7b5552ca6a2bd08f433a7b6ec3d36cb
parent2cc2bade4b0964f0c94537c76e3adf9cbd6ba472 (diff)
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/trunk@229168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-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 b0aa8c024..7e5471f2a 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4769,7 +4769,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. */