[svn-commits] tilghman: trunk r297910 - in /trunk: ./ configs/extensions.conf.sample

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec  8 12:08:27 2010
New Revision: 297910

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297910
Log:
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)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/extensions.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/extensions.conf.sample?view=diff&rev=297910&r1=297909&r2=297910
==============================================================================
--- trunk/configs/extensions.conf.sample (original)
+++ trunk/configs/extensions.conf.sample Wed Dec  8 12:08:27 2010
@@ -428,9 +428,9 @@
 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)