From: Glenn-1990 <g_christiaensen@msn.com>
Date: Wed, 4 Nov 2015 12:28:18 +0000 (+0100)
Subject: also check access old channel on update
X-Git-Tag: v4.2.1~1654
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2f4b14bdf35950bb8f12c29d4651e2a05153cf7;p=thirdparty%2Ftvheadend.git

also check access old channel on update
---

diff --git a/src/htsp_server.c b/src/htsp_server.c
index 01a80f5f8..a45ab0215 100644
--- a/src/htsp_server.c
+++ b/src/htsp_server.c
@@ -1750,13 +1750,17 @@ htsp_method_updateDvrEntry(htsp_connection_t *htsp, htsmsg_t *in)
   if(dvr_entry_verify(de, htsp->htsp_granted_access, 1))
     return htsp_error("User does not have access");
 
+  /* Check access old channel */
+  if (de->de_channel && !htsp_user_access_channel(htsp, de->de_channel))
+    return htsp_error("User does not have access to channel");
+
   if(!htsmsg_get_u32(in, "channelId", &u32))
     channel = channel_find_by_id(u32);
   if (!channel)
     channel = de->de_channel;
 
-  /* Check access */
-  if (!htsp_user_access_channel(htsp, channel))
+  /* Check access new channel */
+  if (channel && !htsp_user_access_channel(htsp, channel))
     return htsp_error("User does not have access to channel");
 
   enabled     = htsmsg_get_s64_or_default(in, "enabled",    -1);