]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
This patch was applied to 1.4 but it completely
authorMark Michelson <mmichelson@digium.com>
Fri, 26 Sep 2008 22:14:59 +0000 (22:14 +0000)
committerMark Michelson <mmichelson@digium.com>
Fri, 26 Sep 2008 22:14:59 +0000 (22:14 +0000)
does not apply since the "found" pointer is not
passed in to this function. If this is going to
be backported, it needs to be done differently or
a deeper backport needs to be done.

Edit: This commit reverts commit number 144677.

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

main/pbx.c

index 3d820ec5c7f19a5870ef0d014f9d1f58b8ed1245..b9bdc9ba5017e0e4b47f5473a3f3a2b68a3d3624 100644 (file)
@@ -1862,8 +1862,6 @@ static int pbx_extension_helper(struct ast_channel *c, struct ast_context *con,
                        return pbx_exec(c, app, passdata);      /* 0 on success, -1 on failure */
                }
        } else if (q.swo) {     /* not found here, but in another switch */
-               if (found)
-                       *found = 1;
                ast_unlock_contexts();
                if (matching_action) {
                        return -1;