diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-10 17:53:25 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-10 17:53:25 +0000 |
| commit | 287a340fa701305ae8ddfcb40ef95a9960cdeb8e (patch) | |
| tree | 3e96c3fb72c92b8fda5f83bbd4020b0ae0b81543 /channels | |
| parent | 7f1faff07f9165d11fae0bdf5baaeceeaaede730 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@229233 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index bdc506611..30a709534 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. */ |