aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authoralecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-20 23:15:25 +0000
committeralecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b>2010-09-20 23:15:25 +0000
commit20d6474a5546b951a2df5cd66acdf8a60b0495a5 (patch)
tree4dbab2d71448147740ca564183991086f306a2d6 /main
parentea303a5b513d43aa488bd6b3281d15255398db2f (diff)
ast_channel_masquerade: remove extra else if
(closes issue #17363,#16057) Reported by: amorsen;davidw,alecdavis Patches: based on bug16057.diff4.txt uploaded by alecdavis (license 585) Tested by: ramonpeek, davidw, alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@287684 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/channel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c
index 24e9f9c86..2f7a20376 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3931,10 +3931,9 @@ retrymasq:
} else if (clone->masq) {
ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
clone->masq->name, clone->name);
- } else if (clone->masqr) {
+ } else { /* (clone->masqr) */
ast_log(LOG_WARNING, "%s is already going to masquerade as %s\n",
clone->name, clone->masqr->name);
- } else {
}
ast_channel_unlock(clone);