summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2008-09-04 17:27:56 +0000
committerJeff Peeler <jpeeler@digium.com>2008-09-04 17:27:56 +0000
commitf7efe4a1f7f096fb5b3978cbf151e52d5e65d75c (patch)
treeed3e8e161ceb22673e5217373b33ebb56d9f0393 /res
parent43285b9273beb3ddb86901ff32d983101824518a (diff)
Merged revisions 141028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r141028 | jpeeler | 2008-09-04 12:00:29 -0500 (Thu, 04 Sep 2008) | 7 lines (closes issue #11979) Fixes multiple parking problems: Crash when executing a park on an extension dialed by AGI due to not returning the proper return code. Crash when using a builtin feature that was a subset of a enabled dynamic feature. Crash due to always hanging up the peer despite the fact that the peer was supposed to be parked. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@141039 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_agi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_agi.c b/res/res_agi.c
index 02b666c38..35e1d7e41 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -2948,7 +2948,7 @@ static int agi_exec_full(struct ast_channel *chan, void *data, int enhanced, int
return -1;
}
- return 0;
+ return res;
}
static int agi_exec(struct ast_channel *chan, void *data)