From: David Vossel <dvossel@digium.com>
Date: Mon, 4 May 2009 22:48:11 +0000 (+0000)
Subject: Merged revisions 192214 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed00c79ed017f2fb2fb04449a8b7697a7b437204;p=thirdparty%2Fasterisk.git

Merged revisions 192214 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192214 | dvossel | 2009-05-04 17:44:51 -0500 (Mon, 04 May 2009) | 17 lines

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

  ........
    r192213 | dvossel | 2009-05-04 17:37:31 -0500 (Mon, 04 May 2009) | 11 lines

    global mohinterpret setting is ignored

    mohinterpret and mohsuggest global variables were not copied over during build_users and build_peers.

    (closes issue #14728)
    Reported by: dimas
    Patches:
          v1-14728.patch uploaded by dimas (license 88)
    Tested by: dimas, dvossel
  ........
................


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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9044d92fd4..3db78d3e0f 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -10646,6 +10646,8 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
 			ast_clear_flag(peer, IAX_HASCALLERID);
 			ast_string_field_set(peer, cid_name, "");
 			ast_string_field_set(peer, cid_num, "");
+			ast_string_field_set(peer, mohinterpret, mohinterpret);
+			ast_string_field_set(peer, mohsuggest, mohsuggest);
 		}
 
 		if (!v) {
@@ -10890,6 +10892,9 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
 			ast_clear_flag(user, IAX_HASCALLERID);
 			ast_string_field_set(user, cid_name, "");
 			ast_string_field_set(user, cid_num, "");
+			ast_string_field_set(user, accountcode, accountcode);
+			ast_string_field_set(user, mohinterpret, mohinterpret);
+			ast_string_field_set(user, mohsuggest, mohsuggest);
 		}
 		if (!v) {
 			v = alt;