access: Fix ACCESS_FULL and handle --noacl also in access_get_by_addr()

tvheadend · Aug 14, 2014 · c7d2595 · c7d2595
1 parent 1579757
commit c7d2595
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/access.c b/src/access.c
@@ -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)

diff --git a/src/access.h b/src/access.h
@@ -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