diff options
author | netblue30 <netblue30@yahoo.com> | 2017-07-17 12:27:39 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2017-07-17 12:27:39 -0400 |
commit | 3a6c96cd7ebdbf865ce86d80beff7937972888b0 (patch) | |
tree | f642c01b23d711afd02288fd53c8c192ad2fbb3d /src | |
parent | Merge pull request #1390 from SpotComms/periodfix (diff) | |
download | firejail-3a6c96cd7ebdbf865ce86d80beff7937972888b0.tar.gz firejail-3a6c96cd7ebdbf865ce86d80beff7937972888b0.tar.zst firejail-3a6c96cd7ebdbf865ce86d80beff7937972888b0.zip |
xvfb fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/x11.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 77bf7749f..2e2e3dff2 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
@@ -215,7 +215,7 @@ void x11_start_xvfb(int argc, char **argv) { | |||
215 | } | 215 | } |
216 | drop_privs(0); | 216 | drop_privs(0); |
217 | 217 | ||
218 | // check xephyr | 218 | // check xvfb |
219 | if (!program_in_path("Xvfb")) { | 219 | if (!program_in_path("Xvfb")) { |
220 | fprintf(stderr, "\nError: Xvfb program was not found in /usr/bin directory, please install it:\n"); | 220 | fprintf(stderr, "\nError: Xvfb program was not found in /usr/bin directory, please install it:\n"); |
221 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xvfb\n"); | 221 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xvfb\n"); |
@@ -263,7 +263,7 @@ void x11_start_xvfb(int argc, char **argv) { | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | if (dquote) { | 265 | if (dquote) { |
266 | fprintf(stderr, "Error: unclosed quote found while parsing xephyr_extra_params\n"); | 266 | fprintf(stderr, "Error: unclosed quote found while parsing xvfb_extra_params\n"); |
267 | exit(1); | 267 | exit(1); |
268 | } | 268 | } |
269 | 269 | ||
@@ -331,7 +331,7 @@ void x11_start_xvfb(int argc, char **argv) { | |||
331 | } | 331 | } |
332 | 332 | ||
333 | if (arg_debug) | 333 | if (arg_debug) |
334 | printf("xephyr server pid %d\n", server); | 334 | printf("xvfb server pid %d\n", server); |
335 | 335 | ||
336 | // check X11 socket | 336 | // check X11 socket |
337 | char *fname; | 337 | char *fname; |
@@ -346,7 +346,7 @@ void x11_start_xvfb(int argc, char **argv) { | |||
346 | }; | 346 | }; |
347 | 347 | ||
348 | if (n == 10) { | 348 | if (n == 10) { |
349 | fprintf(stderr, "Error: failed to start xephyr\n"); | 349 | fprintf(stderr, "Error: failed to start xvfb\n"); |
350 | exit(1); | 350 | exit(1); |
351 | } | 351 | } |
352 | free(fname); | 352 | free(fname); |