kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-19 09:55:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-18 18:27:36 +00:00
parent d36f734cca
commit 4cd913f575
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+1 -1
View File
@@ -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));
contrib/scripts/safe_asterisk
+1 -1
View File
@@ -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