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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e9cb8e3162a666b946963142bb9c9284896c6ed8..d6749540c6f90cdf6e018eb98304e6ea295042c3 100755 (executable)
--- a/channels/chan_zap.c
+++ b/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;