From 669b70180cd09943dc41859945bb1f60987a2b95 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 16 Jun 2014 16:38:18 +0200
Subject: [PATCH] esfilter: fix the exclusive match, add one more log for CA
 filter

---
 src/service.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/service.c b/src/service.c
index fb9396e1..0c8a1121 100644
--- a/src/service.c
+++ b/src/service.c
@@ -409,6 +409,9 @@ filter:
             if (ca == NULL)
               continue;
           }
+          if (esf->esf_log)
+            tvhlog(LOG_INFO, "service", "esfilter: CA match %04x %06x", esf->esf_caid,
+                                                                  esf->esf_caprovider);
         }
         if (esf->esf_log)
           tvhlog(LOG_INFO, "service", "esfilter: %s %03d %05d %s %s %s %s",
@@ -458,11 +461,13 @@ filter:
             p--;
             TAILQ_REMOVE(&t->s_filt_components, sta[p], es_filt_link);
           }
+          st->es_filter = 0;
           service_build_filter_add(t, st, sta, &p);
           exclusive = 1;
           break;
         }
       }
+      if (exclusive) break;
     }
     if (!exclusive) {
       TAILQ_FOREACH(st, &t->s_components, es_link) {