Turn on usecallerid if distinctiveringdetection is on (bug #2389)

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

channels/chan_zap.c

@@ -6158,6 +6158,12 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
 		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;