diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 18:05:26 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-25 18:05:26 +0000 |
| commit | a30205b5009718d51b98217bb5300d9a069bbd52 (patch) | |
| tree | 64208ce01f249ed53dea3352c5ac4222278aab54 | |
| parent | 03ce6b4562b55ae144a5aca94f129823e1878bda (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@30327 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 1 | ||||
| -rw-r--r-- | codecs/gsm/Makefile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f05d16b75..6a02df6cb 100644 --- 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 5da9cd465..f35361ca3 100644 --- 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 |