From 263d1100fdba38e1c344443e0bfca8b5348a0200 Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Sat, 27 Jan 2007 00:07:40 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52369 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 48b30549ac..06c941c839 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -8359,13 +8359,11 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in maskfound++; inet_aton(v->value, &peer->mask); } else if (!strcasecmp(v->name, "context")) { - if (ast_strlen_zero(peer->context)) - ast_copy_string(peer->context, v->value, sizeof(peer->context)); + ast_copy_string(peer->context, v->value, sizeof(peer->context)); } else if (!strcasecmp(v->name, "regexten")) { ast_copy_string(peer->regexten, v->value, sizeof(peer->regexten)); } else if (!strcasecmp(v->name, "peercontext")) { - if (ast_strlen_zero(peer->peercontext)) - ast_copy_string(peer->peercontext, v->value, sizeof(peer->peercontext)); + ast_copy_string(peer->peercontext, v->value, sizeof(peer->peercontext)); } else if (!strcasecmp(v->name, "port")) { if (ast_test_flag(peer, IAX_DYNAMIC)) peer->defaddr.sin_port = htons(atoi(v->value)); -- 2.47.2