diff options
| author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-18 18:27:36 +0000 |
|---|---|---|
| committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-18 18:27:36 +0000 |
| commit | af4c6774e6c3052b7dbc525051dda4cd7f7162ad (patch) | |
| tree | 54a432c528d2987dd77283084c78612df7aa482f | |
| parent | 8bf2fbcc4fb5472a6c25ffc181ecd4403a3b07a4 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@69793 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 | ||||
| -rw-r--r-- | contrib/scripts/safe_asterisk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a8ec96fac..2d5f4b296 100644 --- 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 7ea4a998e..51379e614 100644 --- 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 |