From: Jason Parker <jparker@digium.com>
Date: Thu, 8 Nov 2007 18:48:15 +0000 (+0000)
Subject: Merged revisions 89115 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~932
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e03cb6a721eaa68bea86a935dc6c5e2f129d312f;p=thirdparty%2Fasterisk.git

Merged revisions 89115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11195)
........
r89115 | qwell | 2007-11-08 12:45:15 -0600 (Thu, 08 Nov 2007) | 4 lines

Avoid warnings on load when using sample configuration files.

Issue 11195, patch by eliel.

........


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

diff --git a/configs/cdr_adaptive_odbc.conf.sample b/configs/cdr_adaptive_odbc.conf.sample
index e254bb8be4..d539433f33 100644
--- a/configs/cdr_adaptive_odbc.conf.sample
+++ b/configs/cdr_adaptive_odbc.conf.sample
@@ -17,20 +17,20 @@
 ; table names, you will get duplicate records in that table.  So be careful.
 ;
 
-[first]
-connection=mysql1
-table=cdr
+;[first]
+;connection=mysql1
+;table=cdr
 
-[second]
-connection=mysql1
-table=extracdr
+;[second]
+;connection=mysql1
+;table=extracdr
 
-[third]
-connection=sqlserver
-table=AsteriskCDR
-alias src => source
-alias channel => source_channel
-alias dst => dest
-alias dstchannel => dest_channel
+;[third]
+;connection=sqlserver
+;table=AsteriskCDR
+;alias src => source
+;alias channel => source_channel
+;alias dst => dest
+;alias dstchannel => dest_channel
 
 
diff --git a/configs/res_odbc.conf.sample b/configs/res_odbc.conf.sample
index ecb2cc66a5..617555fef9 100644
--- a/configs/res_odbc.conf.sample
+++ b/configs/res_odbc.conf.sample
@@ -10,7 +10,7 @@ INFORMIXDIR => /opt/informix
 ; All other sections are arbitrary names for database connections.
 
 [asterisk]
-enabled => yes
+enabled => no
 dsn => asterisk
 ;username => myuser
 ;password => mypass