]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
http: fix logic error in 85e1bbb
authorSven Wegener <sven.wegener@stealer.net>
Tue, 10 Nov 2015 07:21:11 +0000 (08:21 +0100)
committerJaroslav Kysela <perex@perex.cz>
Tue, 10 Nov 2015 08:14:15 +0000 (09:14 +0100)
When you're allowed access to a channel, the mask check was ignored.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
src/http.c

index f2e6cb580daf36b48c4c4fa43725cf55d9b9bed4..ef8604571b56abe35990137a365ed73cc79e4171 100644 (file)
@@ -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;