From: Olle Johansson Date: Tue, 1 Jul 2008 12:54:57 +0000 (+0000) Subject: Merged revisions 126844 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~1835 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=162639799610f36c0fd57e48024ece32bc8ec271;p=thirdparty%2Fasterisk.git Merged revisions 126844 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r126844 | oej | 2008-07-01 14:53:01 +0200 (Tis, 01 Jul 2008) | 5 lines Clear up documentation on "domain=" setting in sip.conf Reported by: davidw (closes issue #12413) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126845 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 3f10a4ce49..62241337b1 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -141,10 +141,6 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; ability to place SIP calls based on domain ; names to some other SIP users on the Internet -;domain=mydomain.tld ; Set default domain for this host - ; If configured, Asterisk will only allow - ; INVITE and REFER to non-local domains - ; Use "sip show domains" to list local domains ;pedantic=yes ; Enable checking of tags in headers, ; international character conversions in URIs ; and multiline formatted headers for strict @@ -599,6 +595,9 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; domains, each of which can direct the call to a specific context if desired. ; By default, all domains are accepted and sent to the default context or the ; context associated with the user/peer placing the call. +; REGISTER to non-local domains will be automatically denied if a domain +; list is configured. +; ; Domains can be specified using: ; domain=[,] ; Examples: