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

…entry
tvheadend · Dec 3, 2015 · 88ec9e4 · 88ec9e4
1 parent 7038205
commit 88ec9e4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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));