aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/firecfg/firecfg.config3
-rw-r--r--src/firejail/main.c3
-rw-r--r--src/include/etc_groups.h8
3 files changed, 10 insertions, 4 deletions
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index db73dd1f6..45457fb47 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -260,6 +260,7 @@ firefox-nightly
260firefox-wayland 260firefox-wayland
261firefox-x11 261firefox-x11
262five-or-more 262five-or-more
263fix-qdf
263flacsplt 264flacsplt
264flameshot 265flameshot
265flashpeak-slimjet 266flashpeak-slimjet
@@ -694,6 +695,7 @@ qgis
694qlipper 695qlipper
695qmmp 696qmmp
696qnapi 697qnapi
698qpdf
697qpdfview 699qpdfview
698qq 700qq
699qt-faststart 701qt-faststart
@@ -957,6 +959,7 @@ zart
957zathura 959zathura
958zeal 960zeal
959zim 961zim
962zlib-flate
960zoom 963zoom
961# zpaq - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095) 964# zpaq - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095)
962# zstd - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095) 965# zstd - disable until we fix CLI archivers for makepkg on Arch (see discussion in #3095)
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 9bd65dda5..ac84f00c9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1080,7 +1080,8 @@ int main(int argc, char **argv, char **envp) {
1080 // sanity check for arguments 1080 // sanity check for arguments
1081 for (i = 0; i < argc; i++) { 1081 for (i = 0; i < argc; i++) {
1082 if (strlen(argv[i]) >= MAX_ARG_LEN) { 1082 if (strlen(argv[i]) >= MAX_ARG_LEN) {
1083 fprintf(stderr, "Error: too long arguments: argv[%d] len (%zu) >= MAX_ARG_LEN (%d)\n", i, strlen(argv[i]), MAX_ARG_LEN); 1083 fprintf(stderr, "Error: too long argument: argv[%d] len (%zu) >= MAX_ARG_LEN (%d): %s\n",
1084 i, strlen(argv[i]), MAX_ARG_LEN, argv[i]);
1084 exit(1); 1085 exit(1);
1085 } 1086 }
1086 } 1087 }
diff --git a/src/include/etc_groups.h b/src/include/etc_groups.h
index 0ed5d4e32..9e24256c0 100644
--- a/src/include/etc_groups.h
+++ b/src/include/etc_groups.h
@@ -28,6 +28,10 @@
28static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer 28static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer
29 "alternatives", 29 "alternatives",
30 "fonts", 30 "fonts",
31 "gcrypt", // GNU crypto library - it contains configuration for specialized encryption
32 // and random number generators hardware.
33 // The directory is not installed in Debian. On Fedora it is an empty directory.
34 // The defaults in glibc cover the regular PC.
31 "group", 35 "group",
32 "ld.so.cache", 36 "ld.so.cache",
33 "ld.so.conf", 37 "ld.so.conf",
@@ -49,7 +53,6 @@ static char *etc_group_games[] = {
49 "openal", // 3D sound 53 "openal", // 3D sound
50 "timidity", // MIDI 54 "timidity", // MIDI
51 "timidity.cfg", 55 "timidity.cfg",
52 "vulkan", // next generation OpenGL stack
53 NULL 56 NULL
54}; 57};
55 58
@@ -75,8 +78,6 @@ static char *etc_group_sound[] = {
75static char *etc_group_tls_ca[] = { 78static char *etc_group_tls_ca[] = {
76 "ca-certificates", 79 "ca-certificates",
77 "crypto-policies", 80 "crypto-policies",
78 "gcrypt", // GNU crypto library - contains hardware config for various encryption schemes
79 // and random number generators. The file is not installed by Debian.
80 "pki", 81 "pki",
81 "ssl", 82 "ssl",
82 NULL 83 NULL
@@ -95,6 +96,7 @@ static char *etc_group_x11[] = {
95 "nvidia", // 3D 96 "nvidia", // 3D
96 "pango", // text rendering/internationalization 97 "pango", // text rendering/internationalization
97 "Trolltech.conf", // old QT config file 98 "Trolltech.conf", // old QT config file
99 "vulkan", // next generation OpenGL stack
98 "X11", 100 "X11",
99 "xdg", 101 "xdg",
100 NULL 102 NULL