diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-02 13:49:24 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-02 13:49:24 +0000 |
| commit | 3be57a7ae72a62b46d6abb0e7c37e0275cd856cc (patch) | |
| tree | a04372c4f3bbdf7fe2f4daf9b64323199859ac18 | |
| parent | 7f49728ca950cb6902350241ef6ac3f0e41d1bfb (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@198792 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 | ||||
| -rw-r--r-- | configs/sip.conf.sample | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index e22a63b56..c2e9886fb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6280,7 +6280,7 @@ static int sip_register(const char *value, int lineno) 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]] */ diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 4b40fd4de..0fb6afe54 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -400,7 +400,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ;----------------------------------------- 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] ; ; ; |