]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
access: Fix ACCESS_FULL and handle --noacl also in access_get_by_addr()
authorJaroslav Kysela <perex@perex.cz>
Thu, 14 Aug 2014 10:28:35 +0000 (12:28 +0200)
committerJaroslav Kysela <perex@perex.cz>
Thu, 14 Aug 2014 10:28:35 +0000 (12:28 +0200)
src/access.c
src/access.h

index fa442142fa00cb9c5a8faceba061d940534cc0bb..e7b2acaf44c4b39cae22ddf7fad92b1253fbcd20 100644 (file)
@@ -416,6 +416,11 @@ access_get_by_addr(struct sockaddr *src)
   access_t *a = calloc(1, sizeof(*a));
   access_entry_t *ae;
 
+  if(access_noacl) {
+    a->aa_rights = ACCESS_FULL;
+    return a;
+  }
+
   TAILQ_FOREACH(ae, &access_entries, ae_link) {
 
     if(!ae->ae_enabled)
index 08c2e9e355e0fc817ea748c03f16a67a13e5516f..c90f80b315341b34675f07349586813f5b70448c 100644 (file)
@@ -88,7 +88,8 @@ typedef struct access {
 #define ACCESS_ADMIN              (1<<6)
 
 #define ACCESS_FULL \
-  (ACCESS_STREAMING | ACCESS_WEB_INTERFACE | ACCESS_RECORDER | ACCESS_ADMIN)
+  (ACCESS_STREAMING | ACCESS_ADVANCED_STREAMING | \
+   ACCESS_WEB_INTERFACE | ACCESS_RECORDER | ACCESS_ADMIN)
 
 /**
  * Create a new ticket for the requested resource and generate a id for it