frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dropping capabilities in case cap_sys_time is not available

Browse Source
This commit is contained in:
Klaus Schmidinger
2019-03-18 13:39:56 +01:00
parent 2cf207b53e
commit 1fa861ecb9
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History
Senzel).
- Official release.
2019-03-17: Version 2.4.1
2019-03-18: Version 2.4.1
- Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported
by Johann Friedrichs).
@@ -9386,3 +9386,4 @@ Video Disk Recorder Revision History
- Fixed processing SI::T2DeliverySystemDescriptor when typecasting it over an
SI::ExtensionDescriptor (reported by Helmut Binder).
- Fixed sorting recordings alphabetically.
- Fixed dropping capabilities in case cap_sys_time is not available.

22
vdr.c
View File

@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
* $Id: vdr.c 4.28 2019/03/12 10:01:16 kls Exp $
* $Id: vdr.c 4.29 2019/03/18 11:17:07 kls Exp $
*/
#include <getopt.h>
@@ -126,7 +126,25 @@ static bool SetUser(const char *User, bool UserDump)
static bool DropCaps(void)
{
// drop all capabilities except selected ones
cap_t caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
cap_t caps_all = cap_get_proc();
if (!caps_all) {
fprintf(stderr, "vdr: cap_get_proc failed: %s\n", strerror(errno));
return false;
}
char *caps_text = cap_to_text(caps_all, NULL);
if (!caps_text) {
fprintf(stderr, "vdr: cap_to_text failed: %s\n", strerror(errno));
return false;
}
if (cap_free(caps_all)) {
fprintf(stderr, "vdr: cap_free failed: %s\n", strerror(errno));
return false;
}
cap_t caps;
if (strstr(caps_text,"cap_sys_time"))
caps = cap_from_text("= cap_sys_nice,cap_sys_time,cap_net_raw=ep");
else
caps = cap_from_text("= cap_sys_nice,cap_net_raw=ep");
if (!caps) {
fprintf(stderr, "vdr: cap_from_text failed: %s\n", strerror(errno));
return false;