From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 3 Dec 2015 12:47:58 +0000 (+0100)
Subject: access: do not set uilevel_nochange when allowed in at least one ACL entry
X-Git-Tag: v4.2.1~1389
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88ec9e4ab19f1f58d328ee273a24b203e8825a65;p=thirdparty%2Ftvheadend.git

access: do not set uilevel_nochange when allowed in at least one ACL entry
---

diff --git a/src/access.c b/src/access.c
index 061868f3a..5290c9bc1 100644
--- a/src/access.c
+++ b/src/access.c
@@ -531,8 +531,10 @@ access_update(access_t *a, access_entry_t *ae)
   if(ae->ae_uilevel > a->aa_uilevel)
     a->aa_uilevel = ae->ae_uilevel;
 
-  if(ae->ae_uilevel_nochange > a->aa_uilevel_nochange)
+  if(a->aa_uilevel_nochange < 0)
     a->aa_uilevel_nochange = ae->ae_uilevel_nochange;
+  else if(a->aa_uilevel_nochange && !ae->ae_uilevel_nochange)
+    a->aa_uilevel_nochange = 0;
 
   if(ae->ae_chmin || ae->ae_chmax) {
     uint64_t *p = realloc(a->aa_chrange, (a->aa_chrange_count + 2) * sizeof(uint64_t));