[asterisk-commits] tilghman: branch 1.8 r297909 - in /branches/1.8: ./ configs/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec  8 12:06:04 2010
New Revision: 297909

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297909
Log:
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:
    branches/1.8/   (props changed)
    branches/1.8/configs/extensions.conf.sample

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

Modified: branches/1.8/configs/extensions.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configs/extensions.conf.sample?view=diff&rev=297909&r1=297908&r2=297909
==============================================================================
--- branches/1.8/configs/extensions.conf.sample (original)
+++ branches/1.8/configs/extensions.conf.sample Wed Dec  8 12:06:04 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)