From: Sven Wegener <sven.wegener@stealer.net>
Date: Tue, 10 Nov 2015 07:21:11 +0000 (+0100)
Subject: http: fix logic error in 85e1bbb
X-Git-Tag: v4.2.1~1610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=725cab5062128810a8882cfbfb12ea17fe20bad4;p=thirdparty%2Ftvheadend.git

http: fix logic error in 85e1bbb

When you're allowed access to a channel, the mask check was ignored.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
---

diff --git a/src/http.c b/src/http.c
index f2e6cb580..ef8604571 100644
--- a/src/http.c
+++ b/src/http.c
@@ -587,7 +587,7 @@ http_access_verify_channel(http_connection_t *hc, int mask,
       res = access_verify2(hc->hc_access, mask);
   }
 
-  if (!channel_access(ch, hc->hc_access, 0))
+  if (!res && !channel_access(ch, hc->hc_access, 0))
     res = -1;
 
   return res;