From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 8 Dec 2010 18:06:04 +0000 (+0000)
Subject: Merged revisions 297908 via svnmerge from
X-Git-Tag: 1.8.2-rc1~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b36faabf61c098de0c6c6f2288304f6ce2941af3;p=thirdparty%2Fasterisk.git

Merged revisions 297908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r297908 | tilghman | 2010-12-08 12:04:38 -0600 (Wed, 08 Dec 2010) | 4 lines

  Use inheritance to get correct results for SIPFROMDOMAIN.

  (from an internal Digium discussion)
........


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

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index 1b09afc028..2489d183b9 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -428,9 +428,9 @@ same => n,Set(isnresult=${ENUMLOOKUP(${EXTEN},sip,,1,freenum.org)})     ; perfor
 same => n,GotoIf($["${isnresult}" != ""]?from)
 same => n,Set(DIALSTATUS=CONGESTION)
 same => n,Goto(fn-CONGESTION,1)
-same => n(from),Set(SIPFROMUSER=${CALLERID(num)})
+same => n(from),Set(__SIPFROMUSER=${CALLERID(num)})
 same => n,GotoIf($["${GLOBAL(FREENUMDOMAIN)}" = ""]?dial)               ; check if we set the FREENUMDOMAIN global variable in [global]
-same => n,Set(SIPFROMDOMAIN=${GLOBAL(FREENUMDOMAIN)})                   ;    if we did set it, then we'll use it for our outbound dialing domain
+same => n,Set(__SIPFROMDOMAIN=${GLOBAL(FREENUMDOMAIN)})                 ;    if we did set it, then we'll use it for our outbound dialing domain
 same => n(dial),Dial(SIP/${isnresult},40)
 same => n,Goto(fn-${DIALSTATUS},1)