Merged revisions 372737 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r372737 | jrose | 2012-09-10 12:14:46 -0500 (Mon, 10 Sep 2012) | 15 lines

  Masquerade: Retain parkinglot settings made by CHANNEL function.

  Prior to this patch, the user would have a parkinglot set on a channel that
  was parked and when the channel was retrieved, any attempt by that channel
  to park would simply use the default. This patch makes parkinglot values
  set in this way be retained through the masquerade.

  (closes issue AST-990)
  Reported by: Nick Huskinson
  Patches:
      masquerade_parkinglot_patch.diff Uploaded by Jonathan Rose (license 6182)
  ........

  Merged revisions 372736 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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

diff --git a/main/channel.c b/main/channel.c
index f09dbaa804d91328b2941f7a16399e29ae537f1c..ae5194a0d0ce17e96c95272c70524b6c67957b83 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6900,6 +6900,10 @@ int ast_do_masquerade(struct ast_channel *original)
 
        /* Keep the same language.  */
        ast_string_field_set(original, language, clonechan->language);
+
+       /* Keep the same parkinglot. */
+       ast_string_field_set(original, parkinglot, clonechan->parkinglot);
+
        /* Copy the FD's other than the generator fd */
        for (x = 0; x < AST_MAX_FDS; x++) {
                if (x != AST_GENERATOR_FD)