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.0@229234 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 7c18acd076f16c9bee8788e819a7e90ee6c67c1b..27f8590fb3835fae93a0d5fac736092f804d0033 100644 (file)
--- 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), 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. */