diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/firejail/checkcfg.c | 60 | ||||
-rw-r--r-- | src/firejail/usage.c | 1 |
2 files changed, 24 insertions, 37 deletions
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c index f189ea383..d2289bb40 100644 --- a/src/firejail/checkcfg.c +++ b/src/firejail/checkcfg.c | |||
@@ -305,140 +305,128 @@ errout: | |||
305 | exit(1); | 305 | exit(1); |
306 | } | 306 | } |
307 | 307 | ||
308 | void print_compiletime_support(void) { | 308 | static const char *const compiletime_support = |
309 | printf("Compile time support:\n"); | 309 | "Compile time support:" |
310 | printf("\t- always force nonewprivs support is %s\n", | 310 | "\n\t- always force nonewprivs support is " |
311 | #ifdef HAVE_FORCE_NONEWPRIVS | 311 | #ifdef HAVE_FORCE_NONEWPRIVS |
312 | "enabled" | 312 | "enabled" |
313 | #else | 313 | #else |
314 | "disabled" | 314 | "disabled" |
315 | #endif | 315 | #endif |
316 | ); | ||
317 | 316 | ||
318 | printf("\t- AppArmor support is %s\n", | 317 | "\n\t- AppArmor support is " |
319 | #ifdef HAVE_APPARMOR | 318 | #ifdef HAVE_APPARMOR |
320 | "enabled" | 319 | "enabled" |
321 | #else | 320 | #else |
322 | "disabled" | 321 | "disabled" |
323 | #endif | 322 | #endif |
324 | ); | ||
325 | 323 | ||
326 | printf("\t- AppImage support is %s\n", | 324 | "\n\t- AppImage support is " |
327 | #ifdef LOOP_CTL_GET_FREE // test for older kernels; this definition is found in /usr/include/linux/loop.h | 325 | #ifdef LOOP_CTL_GET_FREE // test for older kernels; this definition is found in /usr/include/linux/loop.h |
328 | "enabled" | 326 | "enabled" |
329 | #else | 327 | #else |
330 | "disabled" | 328 | "disabled" |
331 | #endif | 329 | #endif |
332 | ); | ||
333 | 330 | ||
334 | printf("\t- chroot support is %s\n", | 331 | "\n\t- chroot support is " |
335 | #ifdef HAVE_CHROOT | 332 | #ifdef HAVE_CHROOT |
336 | "enabled" | 333 | "enabled" |
337 | #else | 334 | #else |
338 | "disabled" | 335 | "disabled" |
339 | #endif | 336 | #endif |
340 | ); | ||
341 | 337 | ||
342 | printf("\t- D-BUS proxy support is %s\n", | 338 | "\n\t- D-BUS proxy support is " |
343 | #ifdef HAVE_DBUSPROXY | 339 | #ifdef HAVE_DBUSPROXY |
344 | "enabled" | 340 | "enabled" |
345 | #else | 341 | #else |
346 | "disabled" | 342 | "disabled" |
347 | #endif | 343 | #endif |
348 | ); | ||
349 | 344 | ||
350 | printf("\t- file transfer support is %s\n", | 345 | "\n\t- file transfer support is " |
351 | #ifdef HAVE_FILE_TRANSFER | 346 | #ifdef HAVE_FILE_TRANSFER |
352 | "enabled" | 347 | "enabled" |
353 | #else | 348 | #else |
354 | "disabled" | 349 | "disabled" |
355 | #endif | 350 | #endif |
356 | ); | ||
357 | 351 | ||
358 | printf("\t- firetunnel support is %s\n", | 352 | "\n\t- firetunnel support is " |
359 | #ifdef HAVE_FIRETUNNEL | 353 | #ifdef HAVE_FIRETUNNEL |
360 | "enabled" | 354 | "enabled" |
361 | #else | 355 | #else |
362 | "disabled" | 356 | "disabled" |
363 | #endif | 357 | #endif |
364 | ); | ||
365 | 358 | ||
366 | printf("\t- IDS support is %s\n", | 359 | "\n\t- IDS support is " |
367 | #ifdef HAVE_IDS | 360 | #ifdef HAVE_IDS |
368 | "enabled" | 361 | "enabled" |
369 | #else | 362 | #else |
370 | "disabled" | 363 | "disabled" |
371 | #endif | 364 | #endif |
372 | ); | ||
373 | 365 | ||
374 | printf("\t- networking support is %s\n", | 366 | "\n\t- networking support is " |
375 | #ifdef HAVE_NETWORK | 367 | #ifdef HAVE_NETWORK |
376 | "enabled" | 368 | "enabled" |
377 | #else | 369 | #else |
378 | "disabled" | 370 | "disabled" |
379 | #endif | 371 | #endif |
380 | ); | ||
381 | 372 | ||
382 | printf("\t- output logging is %s\n", | 373 | "\n\t- output logging is " |
383 | #ifdef HAVE_OUTPUT | 374 | #ifdef HAVE_OUTPUT |
384 | "enabled" | 375 | "enabled" |
385 | #else | 376 | #else |
386 | "disabled" | 377 | "disabled" |
387 | #endif | 378 | #endif |
388 | ); | 379 | |
389 | printf("\t- overlayfs support is %s\n", | 380 | "\n\t- overlayfs support is " |
390 | #ifdef HAVE_OVERLAYFS | 381 | #ifdef HAVE_OVERLAYFS |
391 | "enabled" | 382 | "enabled" |
392 | #else | 383 | #else |
393 | "disabled" | 384 | "disabled" |
394 | #endif | 385 | #endif |
395 | ); | ||
396 | 386 | ||
397 | printf("\t- private-home support is %s\n", | 387 | "\n\t- private-home support is " |
398 | #ifdef HAVE_PRIVATE_HOME | 388 | #ifdef HAVE_PRIVATE_HOME |
399 | "enabled" | 389 | "enabled" |
400 | #else | 390 | #else |
401 | "disabled" | 391 | "disabled" |
402 | #endif | 392 | #endif |
403 | ); | ||
404 | 393 | ||
405 | printf("\t- private-lib support is %s\n", | 394 | "\n\t- private-lib support is " |
406 | #ifdef HAVE_PRIVATE_LIB | 395 | #ifdef HAVE_PRIVATE_LIB |
407 | "enabled" | 396 | "enabled" |
408 | #else | 397 | #else |
409 | "disabled" | 398 | "disabled" |
410 | #endif | 399 | #endif |
411 | ); | ||
412 | 400 | ||
413 | printf("\t- private-cache and tmpfs as user %s\n", | 401 | "\n\t- private-cache and tmpfs as user " |
414 | #ifdef HAVE_USERTMPFS | 402 | #ifdef HAVE_USERTMPFS |
415 | "enabled" | 403 | "enabled" |
416 | #else | 404 | #else |
417 | "disabled" | 405 | "disabled" |
418 | #endif | 406 | #endif |
419 | ); | ||
420 | 407 | ||
421 | printf("\t- SELinux support is %s\n", | 408 | "\n\t- SELinux support is " |
422 | #ifdef HAVE_SELINUX | 409 | #ifdef HAVE_SELINUX |
423 | "enabled" | 410 | "enabled" |
424 | #else | 411 | #else |
425 | "disabled" | 412 | "disabled" |
426 | #endif | 413 | #endif |
427 | ); | ||
428 | 414 | ||
429 | printf("\t- user namespace support is %s\n", | 415 | "\n\t- user namespace support is " |
430 | #ifdef HAVE_USERNS | 416 | #ifdef HAVE_USERNS |
431 | "enabled" | 417 | "enabled" |
432 | #else | 418 | #else |
433 | "disabled" | 419 | "disabled" |
434 | #endif | 420 | #endif |
435 | ); | ||
436 | 421 | ||
437 | printf("\t- X11 sandboxing support is %s\n", | 422 | "\n\t- X11 sandboxing support is " |
438 | #ifdef HAVE_X11 | 423 | #ifdef HAVE_X11 |
439 | "enabled" | 424 | "enabled" |
440 | #else | 425 | #else |
441 | "disabled" | 426 | "disabled" |
442 | #endif | 427 | #endif |
443 | ); | 428 | "\n"; |
429 | |||
430 | void print_compiletime_support(void) { | ||
431 | puts(compiletime_support); | ||
444 | } | 432 | } |
diff --git a/src/firejail/usage.c b/src/firejail/usage.c index 8ec868fae..35f54d113 100644 --- a/src/firejail/usage.c +++ b/src/firejail/usage.c | |||
@@ -321,7 +321,6 @@ void print_version(void) { | |||
321 | void print_version_full(void) { | 321 | void print_version_full(void) { |
322 | print_version(); | 322 | print_version(); |
323 | print_compiletime_support(); | 323 | print_compiletime_support(); |
324 | printf("\n"); | ||
325 | } | 324 | } |
326 | 325 | ||
327 | void usage(void) { | 326 | void usage(void) { |