From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 12 Dec 2011 18:13:22 +0000 (+0000)
Subject: Reverting -r347953 for ASTERISK-14122
X-Git-Tag: 10.1.0-rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af870fd2ff0937f74b7b179aca7b7bd7bf7b976;p=thirdparty%2Fasterisk.git

Reverting -r347953 for ASTERISK-14122

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@347955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 10c55ca756..841787c4c5 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -51,9 +51,9 @@
 ;
 ;language=en
 ;
-; Context for incoming calls. Defaults to 'default'
+; Context for calls. Defaults to 'default'
 ;
-context=public
+;context=incoming
 ;
 ; Switchtype:  Only used for PRI.
 ;
diff --git a/configs/chan_ooh323.conf.sample b/configs/chan_ooh323.conf.sample
index a39a47afc2..20ccf73ec3 100644
--- a/configs/chan_ooh323.conf.sample
+++ b/configs/chan_ooh323.conf.sample
@@ -88,7 +88,7 @@ gatekeeper = DISABLE
 
 ;Sets default context all clients will be placed in.
 ;Default - default
-context=public
+context=default
 
 ;Sets rtptimeout for all clients, unless overridden
 ;Default - 60 seconds
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index b9d21d3613..8906845783 100644
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -653,15 +653,6 @@ exten => _X.,1,Macro(page,SIP/${EXTEN})
 ;exten => 1,1,Goto(default,steve,1)
 ;exten => 2,1,Goto(default,mark,2)
 
-[public]
-;
-; ATTENTION: If your Asterisk is connected to the internet and you do
-; not have allowguest=no in sip.conf, everybody out there may use your
-; public context without authentication.  In that case you want to
-; double check which services you offer to the world.
-;
-include => demo
-
 [default]
 ;
 ; By default we include the demo.  In a production system, you
diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample
index 3badcb4aae..5868de4f7b 100644
--- a/configs/extensions.lua.sample
+++ b/configs/extensions.lua.sample
@@ -144,7 +144,7 @@ extensions = {
 		end;
 
 		["1000"] = function()
-			app.goto("demo", "s", 1)
+			app.goto("default", "s", 1)
 		end;
 
 		["1234"] = function()
@@ -194,15 +194,6 @@ extensions = {
 		include = {"demo"};
 	};
 
-	public = {
-		-- ATTENTION: If your Asterisk is connected to the internet and you do
-		-- not have allowguest=no in sip.conf, everybody out there may use your
-		-- public context without authentication.  In that case you want to
-		-- double check which services you offer to the world.
-		--
-		include = {"demo"};
-	};
-
 	["local"] = {
 		["_NXXXXXX"] = outgoing_local;
 	};
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 2f5858e95a..35b8d7744c 100644
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -409,7 +409,7 @@ autokill=yes
 ;
 [guest]
 type=user
-context=public
+context=default
 callerid="Guest IAX User"
 
 ;
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index bea93c58b3..8cc496be87 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -112,7 +112,7 @@
 ; "setvar" to set variables that can be used in the dialplan for various limits.
 
 [general]
-context=public                  ; Default context for incoming calls. Defaults to 'default'
+context=default                 ; Default context for incoming calls
 ;allowguest=no                  ; Allow or reject guest calls (default is yes)
 				; If your Asterisk is connected to the Internet
 				; and you have allowguest=yes
diff --git a/configs/vpb.conf.sample b/configs/vpb.conf.sample
index fecb3ec597..31e5da1ec6 100644
--- a/configs/vpb.conf.sample
+++ b/configs/vpb.conf.sample
@@ -77,7 +77,7 @@ language=en
 ;
 ; Default context
 ;
-context=public
+context=default
 
 ;
 ; Echo cancellation