kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 07:54:50 -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@30327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-25 18:05:26 +00:00
parent a5cfea7f28
commit 4f6e1f4878
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+1
View File
@@ -7264,6 +7264,7 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
}
if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_num))
ast_copy_string(p->cid_name, user->cid_name, sizeof(p->cid_name));
ast_copy_string(p->peername, user->name, sizeof(p->peername));
ast_copy_string(p->username, user->name, sizeof(p->username));
ast_copy_string(p->peersecret, user->secret, sizeof(p->peersecret));
ast_copy_string(p->subscribecontext, user->subscribecontext, sizeof(p->subscribecontext));
codecs/gsm/Makefile
+1
View File
@@ -50,6 +50,7 @@ ifneq (${PROC},sparc64)
ifneq (${PROC},arm)
ifneq (${PROC},ppc)
ifneq (${PROC},ppc64)
ifneq (${PROC},s390)
OPTIMIZE+=-march=$(PROC)
endif
endif