automerge commit

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 48b30549ac0686f778f466c0f99fa3b9c21ec01a..06c941c839ea0565a5b12493a8b608398c5d1381 100644 (file)
--- 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));