[Asterisk-cvs] asterisk/channels chan_zap.c,1.333,1.334

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv21541/channels

Modified Files:
	chan_zap.c 
Log Message:
Turn on usecallerid if distinctiveringdetection is on (bug #2389)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -d -r1.333 -r1.334
--- chan_zap.c	4 Sep 2004 15:00:05 -0000	1.333
+++ chan_zap.c	7 Sep 2004 01:56:18 -0000	1.334
@@ -6158,6 +6158,12 @@
 		tmp->restrictcid = restrictcid;
 		tmp->use_callingpres = use_callingpres;
 		tmp->priindication_oob = priindication_oob;
+		if (tmp->usedistinctiveringdetection) {
+			if (!tmp->use_callerid) {
+				ast_log(LOG_NOTICE, "Distinctive Ring detect requires 'usecallerid' be on\n");
+				tmp->use_callerid = 1;
+			}
+		}
 
 		strncpy(tmp->accountcode, accountcode, sizeof(tmp->accountcode)-1);
 		tmp->amaflags = amaflags;