[asterisk-commits] oej: branch 1.6.1 r168714 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jan 15 12:18:34 2009
New Revision: 168714

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

........
r168712 | oej | 2009-01-15 19:08:59 +0100 (Tor, 15 Jan 2009) | 3 lines

Make sure that we have the same terminology in sip.conf.sample and the source code warning.
Thanks Nick Lewis for pointing this out in the bug tracker.

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=168714&r1=168713&r2=168714
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Jan 15 12:18:34 2009
@@ -6470,7 +6470,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]]@host[:port][/contact][~expiry] at line %d\n", lineno);
+		ast_log(LOG_WARNING, "Format for registration is [transport://]user[:secret[:authuser]]@domain[:port][/extension][~expiry] at line %d\n", lineno);
 		return -1;
 	}
 	/* split user[:secret[:authuser]] */