]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
access: do not set uilevel_nochange when allowed in at least one ACL entry
authorJaroslav Kysela <perex@perex.cz>
Thu, 3 Dec 2015 12:47:58 +0000 (13:47 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 3 Dec 2015 12:47:58 +0000 (13:47 +0100)
src/access.c

index 061868f3ad35dfcb7baf2e8852944f9a1d20aaeb..5290c9bc11cf4b48dffba08388187a229ae7ce24 100644 (file)
@@ -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));