diff options
| author |  Topi Miettinen <toiwoton@gmail.com> | 2018-01-10 00:11:17 +0200 |
|---|---|---|
| committer | Topi Miettinen <toiwoton@gmail.com> | 2018-01-10 00:13:02 +0200 |
| commit | 4ee58af27749143d6e5d4bf774801b48f5b47954 (patch) | |
| tree | d8a769fc9dfcd8e29654bbf9560b622a79c77486 | |
| parent | disable qml disk cache globally (diff) | |
| download | firejail-4ee58af27749143d6e5d4bf774801b48f5b47954.tar.gz firejail-4ee58af27749143d6e5d4bf774801b48f5b47954.tar.zst firejail-4ee58af27749143d6e5d4bf774801b48f5b47954.zip | |
fs_lib: don't ldd directories
| -rw-r--r-- | src/firejail/fs_lib.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c index ad86d1fd8..841af0b93 100644 --- a/src/firejail/fs_lib.c +++ b/src/firejail/fs_lib.c | |||
| @@ -341,28 +341,22 @@ void fs_private_lib(void) { | |||
| 341 | char *name; | 341 | char *name; |
| 342 | if (asprintf(&name, "/usr/lib/%s", ptr) == -1) | 342 | if (asprintf(&name, "/usr/lib/%s", ptr) == -1) |
| 343 | errExit("asprintf"); | 343 | errExit("asprintf"); |
| 344 | if (is_dir(name)) { | 344 | if (is_dir(name)) |
| 345 | fslib_copy_dir(name); | 345 | fslib_copy_dir(name); |
| 346 | fslib_copy_libs(name); | ||
| 347 | } | ||
| 348 | free(name); | 346 | free(name); |
| 349 | 347 | ||
| 350 | // /usr/lib/x86_linux-gnu - debian & frriends | 348 | // /usr/lib/x86_linux-gnu - debian & frriends |
| 351 | if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr) == -1) | 349 | if (asprintf(&name, "/usr/lib/x86_64-linux-gnu/%s", ptr) == -1) |
| 352 | errExit("asprintf"); | 350 | errExit("asprintf"); |
| 353 | if (is_dir(name)) { | 351 | if (is_dir(name)) |
| 354 | fslib_copy_dir(name); | 352 | fslib_copy_dir(name); |
| 355 | fslib_copy_libs(name); | ||
| 356 | } | ||
| 357 | free(name); | 353 | free(name); |
| 358 | 354 | ||
| 359 | // /usr/lib64 - CentOS, Fedora | 355 | // /usr/lib64 - CentOS, Fedora |
| 360 | if (asprintf(&name, "/usr/lib64/%s", ptr) == -1) | 356 | if (asprintf(&name, "/usr/lib64/%s", ptr) == -1) |
| 361 | errExit("asprintf"); | 357 | errExit("asprintf"); |
| 362 | if (is_dir(name)) { | 358 | if (is_dir(name)) |
| 363 | fslib_copy_dir(name); | 359 | fslib_copy_dir(name); |
| 364 | fslib_copy_libs(name); | ||
| 365 | } | ||
| 366 | free(name); | 360 | free(name); |
| 367 | } | 361 | } |
| 368 | } | 362 | } |