Page MenuHomeFreeBSD
Files F145107837

D28341.diff
No OneTemporary
Actions

D28341.diff
View Options

Index: FreeBSD/lib/libcasper/services/cap_fileargs/tests/Makefile
===================================================================
--- FreeBSD/lib/libcasper/services/cap_fileargs/tests/Makefile
+++ FreeBSD/lib/libcasper/services/cap_fileargs/tests/Makefile
@@ -4,6 +4,8 @@
ATF_TESTS_C= fileargs_test
+CFLAGS+= -I${SRCTOP}/tests
+
.if ${MK_CASPER} != "no"
LIBADD+= casper
LIBADD+= cap_fileargs
Index: FreeBSD/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
===================================================================
--- FreeBSD/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
+++ FreeBSD/lib/libcasper/services/cap_fileargs/tests/fileargs_test.c
@@ -39,6 +39,8 @@
#include <libcasper.h>
#include <casper/cap_fileargs.h>
+#include "freebsd_test_suite/macros.h"
+
#define MAX_FILES 200
static char *files[MAX_FILES];
@@ -46,6 +48,13 @@
#define TEST_FILE "/etc/passwd"
+static void
+check_capsicum(void)
+{
+ ATF_REQUIRE_FEATURE("security_capabilities");
+ ATF_REQUIRE_FEATURE("security_capability_mode");
+}
+
static void
prepare_files(size_t num, bool create)
{
@@ -281,6 +290,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_READ | CAP_FCNTL);
@@ -326,6 +337,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL);
@@ -371,6 +384,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, false);
cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL | CAP_READ);
@@ -414,6 +429,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
capcas = cap_init();
@@ -448,6 +465,8 @@
FILE *pfile;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_READ | CAP_FCNTL);
@@ -496,6 +515,8 @@
FILE *pfile;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_WRITE | CAP_FCNTL);
@@ -544,6 +565,8 @@
FILE *pfile;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, false);
cap_rights_init(&rights, CAP_READ | CAP_WRITE | CAP_FCNTL);
@@ -585,6 +608,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
fa = fileargs_init(MAX_FILES, files, 0, 0, NULL, FA_LSTAT);
@@ -646,6 +671,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_READ | CAP_FCNTL);
@@ -692,6 +719,8 @@
size_t i;
int fd;
+ check_capsicum();
+
prepare_files(MAX_FILES, true);
cap_rights_init(&rights, CAP_READ | CAP_FCNTL);

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 17, 1:34 AM (12 h, 47 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28796371
Default Alt Text
D28341.diff (2 KB)

Event Timeline