[asterisk-commits] tzafrir: branch group/zapata_conf r84141 - in /team/group/zapata_conf: channe...

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Sat Sep 29 20:58:34 2007
New Revision: 84141

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84141
Log:
 * If signalling=auto, signalling is only set later. Avoid a sanity
   check.
 * Fix a broken line in zapata.conf.

Modified:
    team/group/zapata_conf/channels/chan_zap.c
    team/group/zapata_conf/configs/zapata.conf.sample

Modified: team/group/zapata_conf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_zap.c?view=diff&rev=84141&r1=84140&r2=84141
==============================================================================
--- team/group/zapata_conf/channels/chan_zap.c (original)
+++ team/group/zapata_conf/channels/chan_zap.c Sat Sep 29 20:58:34 2007
@@ -11943,7 +11943,7 @@
 	int trunkgroup, y;
 #endif
 	
-	if ((reload == 0) && (conf.chan.sig < 0)) {
+	if ((reload == 0) && (conf.chan.sig < 0) && !conf.is_sig_auto) {
 		ast_log(LOG_ERROR, "Signalling must be specified before any channels are.\n");
 		return -1;
 	}

Modified: team/group/zapata_conf/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/configs/zapata.conf.sample?view=diff&rev=84141&r1=84140&r2=84141
==============================================================================
--- team/group/zapata_conf/configs/zapata.conf.sample (original)
+++ team/group/zapata_conf/configs/zapata.conf.sample Sat Sep 29 20:58:34 2007
@@ -562,8 +562,7 @@
 ; with "progzone".
 ;
 ; progzone also affects the pattern used for buzydetect (unless
-busypattern is set explicitly). The possible
-; values are: 
+; busypattern is set explicitly). The possible values are: 
 ;   us (default)
 ;   ca (alias for 'us')
 ;   cr (Costa Rica)