automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f05d16b758e6f77953f5665e6555d0cf35f027a3..6a02df6cb1e32575a67cc9ede7c72bed398893f0 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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));

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 5da9cd465bd99fb80b45bf3fe253351ef42f6e61..f35361ca3de693543a4e6e0ff9283264bdce0ac7 100644 (file)
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -50,6 +50,7 @@ ifneq (${PROC},sparc64)
 ifneq (${PROC},arm)
 ifneq (${PROC},ppc)
 ifneq (${PROC},ppc64)
+ifneq (${PROC},s390)
 OPTIMIZE+=-march=$(PROC)
 endif
 endif