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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index b0aa8c024c254f1c86db655e0472efd0c4953077..7e5471f2a3ebc5bbf5f0c48ddc7977853e67e15f 100644 (file)
--- 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. */