From: Joshua Colp <jcolp@digium.com>
Date: Mon, 4 Jun 2007 17:43:21 +0000 (+0000)
Subject: Merged revisions 67064 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2512
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e6d4be830d67681b9033f26f1305e16218b373a;p=thirdparty%2Fasterisk.git

Merged revisions 67064 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67064 | file | 2007-06-04 13:41:59 -0400 (Mon, 04 Jun 2007) | 2 lines

Returning a value that indicates the parking of a call was a success when it really wasn't (because the parking slot selected was in use) is the wrong thing to do. (issue #9723 reported by mdu113)

........


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

diff --git a/res/res_features.c b/res/res_features.c
index 28b41de307..5efc9e8392 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -377,7 +377,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
 			ast_mutex_unlock(&parking_lock);
 			free(pu);
 			ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parking_con);
-			return 0;	/* Continue execution if possible */
+			return -1; /* We failed to park this call, plain and simple so we need to error out */
 		}
 		ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
 		x = atoi(parkingexten);