diff options
author | smitsohu <smitsohu@gmail.com> | 2021-02-25 02:58:52 +0100 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2021-02-25 02:58:52 +0100 |
commit | 17a95eb7cf8494405a259ed029d4cdc912dbef46 (patch) | |
tree | 39831f330e6363ab6665d7ddbb85c22a54605024 /src | |
parent | private-lib: minor simplification (diff) | |
download | firejail-17a95eb7cf8494405a259ed029d4cdc912dbef46.tar.gz firejail-17a95eb7cf8494405a259ed029d4cdc912dbef46.tar.zst firejail-17a95eb7cf8494405a259ed029d4cdc912dbef46.zip |
cleanup
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/profile.c | 1 | ||||
-rw-r--r-- | src/firejail/pulseaudio.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/firejail/profile.c b/src/firejail/profile.c index b706839a1..9339228f4 100644 --- a/src/firejail/profile.c +++ b/src/firejail/profile.c | |||
@@ -931,7 +931,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) { | |||
931 | return 0; | 931 | return 0; |
932 | } | 932 | } |
933 | if (strncmp(ptr, "rmenv ", 6) == 0) { | 933 | if (strncmp(ptr, "rmenv ", 6) == 0) { |
934 | unsetenv(ptr + 6); // Remove also immediately from Firejail itself | ||
935 | env_store(ptr + 6, RMENV); | 934 | env_store(ptr + 6, RMENV); |
936 | return 0; | 935 | return 0; |
937 | } | 936 | } |
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c index 08f9a14a7..4b9203c36 100644 --- a/src/firejail/pulseaudio.c +++ b/src/firejail/pulseaudio.c | |||
@@ -80,8 +80,6 @@ static void pulseaudio_fallback(const char *path) { | |||
80 | 80 | ||
81 | fmessage("Cannot mount tmpfs on %s/.config/pulse\n", cfg.homedir); | 81 | fmessage("Cannot mount tmpfs on %s/.config/pulse\n", cfg.homedir); |
82 | env_store_name_val("PULSE_CLIENTCONFIG", path, SETENV); | 82 | env_store_name_val("PULSE_CLIENTCONFIG", path, SETENV); |
83 | if (setenv("PULSE_CLIENTCONFIG", path, 1) < 0) | ||
84 | errExit("setenv"); | ||
85 | } | 83 | } |
86 | 84 | ||
87 | // disable shm in pulseaudio (issue #69) | 85 | // disable shm in pulseaudio (issue #69) |
@@ -176,8 +174,7 @@ void pulseaudio_init(void) { | |||
176 | char *p; | 174 | char *p; |
177 | if (asprintf(&p, "%s/client.conf", homeusercfg) == -1) | 175 | if (asprintf(&p, "%s/client.conf", homeusercfg) == -1) |
178 | errExit("asprintf"); | 176 | errExit("asprintf"); |
179 | if (setenv("PULSE_CLIENTCONFIG", p, 1) < 0) | 177 | env_store_name_val("PULSE_CLIENTCONFIG", p, SETENV); |
180 | errExit("setenv"); | ||
181 | fs_logger2("create", p); | 178 | fs_logger2("create", p); |
182 | free(p); | 179 | free(p); |
183 | 180 | ||