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: https://origsvn.digium.com/svn/asterisk/branches/1.4@287684 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 24e9f9c861e9933a5bf7be78881ab86d71cd32bd..2f7a203763414e61424d17cfc7390581812e81e6 100644 (file)
--- 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);