Merged revisions 297909 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297909 | tilghman | 2010-12-08 12:06:04 -0600 (Wed, 08 Dec 2010) | 11 lines
  
  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/trunk@297910 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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)