aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2023-02-04 19:27:27 -0500
committerLibravatar GitHub <noreply@github.com>2023-02-04 19:27:27 -0500
commit20b8326368e12063772f92bba354c64c5d7a2302 (patch)
treebb2d27d795ac63ee3ef4ac918342c1cf3453b23b
parenttesting (diff)
parentetc_groups.h: sort groups alphabetically (diff)
downloadfirejail-20b8326368e12063772f92bba354c64c5d7a2302.tar.gz
firejail-20b8326368e12063772f92bba354c64c5d7a2302.tar.zst
firejail-20b8326368e12063772f92bba354c64c5d7a2302.zip
Merge pull request #5638 from glitsj16/etc-groups
etc_groups.h: sort groups alphabetically
-rw-r--r--src/include/etc_groups.h38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/include/etc_groups.h b/src/include/etc_groups.h
index fcb824778..052b737db 100644
--- a/src/include/etc_groups.h
+++ b/src/include/etc_groups.h
@@ -27,6 +27,7 @@
27static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer 27static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer
28 "alternatives", 28 "alternatives",
29 "fonts", 29 "fonts",
30 "group",
30 "ld.so.cache", 31 "ld.so.cache",
31 "ld.so.conf", 32 "ld.so.conf",
32 "ld.so.conf.d", 33 "ld.so.conf.d",
@@ -38,16 +39,14 @@ static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer
38 "login.defs", // firejail reading UID/GID MIN and MAX at startup 39 "login.defs", // firejail reading UID/GID MIN and MAX at startup
39 "nsswitch.conf", 40 "nsswitch.conf",
40 "passwd", 41 "passwd",
41 "group",
42 NULL 42 NULL
43}; 43};
44 44
45// @sound 45// @games
46static char *etc_group_sound[] = { 46static char *etc_group_games[] = {
47 "alsa", 47 "openal", // 3D sound
48 "asound.conf", 48 "timidity", // MIDI
49 "machine-id", // required by PulseAudio 49 "timidity.cfg",
50 "pulse",
51 NULL 50 NULL
52}; 51};
53 52
@@ -55,8 +54,17 @@ static char *etc_group_sound[] = {
55static char*etc_group_network[] = { 54static char*etc_group_network[] = {
56 "hostname", 55 "hostname",
57 "hosts", 56 "hosts",
58 "resolv.conf",
59 "protocols", 57 "protocols",
58 "resolv.conf",
59 NULL
60};
61
62// @sound
63static char *etc_group_sound[] = {
64 "alsa",
65 "asound.conf",
66 "machine-id", // required by PulseAudio
67 "pulse",
60 NULL 68 NULL
61}; 69};
62 70
@@ -72,24 +80,16 @@ static char *etc_group_tls_ca[] = {
72 80
73// @x11 81// @x11
74static char *etc_group_x11[] = { 82static char *etc_group_x11[] = {
75 "xdg",
76 "drirc",
77 "dconf", 83 "dconf",
84 "drirc",
78 "gtk-2.0", 85 "gtk-2.0",
79 "gtk-3.0", 86 "gtk-3.0",
80 "kde4rc", 87 "kde4rc",
81 "kde5rc", 88 "kde5rc",
82 "pango", // text rendering/internationalization
83 "nvidia", 89 "nvidia",
90 "pango", // text rendering/internationalization
84 "X11", 91 "X11",
85 NULL 92 "xdg",
86};
87
88// @games
89static char *etc_group_games[] = {
90 "timidity", // MIDI
91 "timidity.cfg",
92 "openal", // 3D sound
93 NULL 93 NULL
94}; 94};
95 95