automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69793 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a8ec96fac631b188fad1d876d39132f8a04cbc93..2d5f4b296995d659bfcd160b8f40460cf6e2aa18 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1920,7 +1920,7 @@ static int create_addr_from_peer(struct sip_pvt *r, struct sip_peer *peer)
                ast_log(LOG_DEBUG, "Setting NAT on VRTP to %d\n", (ast_test_flag(r, SIP_NAT) & SIP_NAT_ROUTE));
                ast_rtp_setnat(r->vrtp, (ast_test_flag(r, SIP_NAT) & SIP_NAT_ROUTE));
        }
-       ast_copy_string(r->peername, peer->username, sizeof(r->peername));
+       ast_copy_string(r->peername, peer->name, sizeof(r->peername));
        ast_copy_string(r->authname, peer->username, sizeof(r->authname));
        ast_copy_string(r->username, peer->username, sizeof(r->username));
        ast_copy_string(r->peersecret, peer->secret, sizeof(r->peersecret));

diff --git a/contrib/scripts/safe_asterisk b/contrib/scripts/safe_asterisk
index 7ea4a998edd311cdb2181de39e1a427e6d802e20..51379e6143552aa9105b8ea0f78bc6d3d3664085 100644 (file)
--- a/contrib/scripts/safe_asterisk
+++ b/contrib/scripts/safe_asterisk
@@ -39,7 +39,7 @@ ulimit -c unlimited
 #
 # Don't die if stdout/stderr can't be written to
 #
-trap '' SIGPIPE
+trap '' PIPE
 
 #
 # Run scripts to set any environment variables or do any other system-specific setup needed