[svn-commits] file: branch 1.6.0 r198792 - in /branches/1.6.0: ./ channels/ configs/

[SVN commits to the Digium repositories]

Author: file
Date: Tue Jun  2 08:49:24 2009
New Revision: 198792

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198792
Log:
Merged revisions 198791 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198791 | file | 2009-06-02 10:48:06 -0300 (Tue, 02 Jun 2009) | 5 lines
  
  Correct documentation for the register line, specifically where the domain should be specified.
  
  (closes issue #14367)
  Reported by: Nick_Lewis
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c
    branches/1.6.0/configs/sip.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=198792&r1=198791&r2=198792
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jun  2 08:49:24 2009
@@ -6280,7 +6280,7 @@
 	if (hostname)
 		*hostname++ = '\0';
 	if (ast_strlen_zero(username) || ast_strlen_zero(hostname)) {
-		ast_log(LOG_WARNING, "Format for registration is [transport://]user[:secret[:authuser]]@domain[:port][/extension] at line %d\n", lineno);
+		ast_log(LOG_WARNING, "Format for registration is [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension] at line %d\n", lineno);
 		return -1;
 	}
 	/* split user[:secret[:authuser]] */

Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=198792&r1=198791&r2=198792
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Tue Jun  2 08:49:24 2009
@@ -400,7 +400,7 @@
 ;----------------------------------------- OUTBOUND SIP REGISTRATIONS  ------------------------
 ; Asterisk can register as a SIP user agent to a SIP proxy (provider)
 ; Format for the register statement is:
-;       register => [transport://]user[:secret[:authuser]]@domain[:port][/extension]
+;       register => [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension]
 ;
 ; 
 ;