diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-06 17:19:21 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-06 17:19:21 +0100 |
| commit | 871fa294ff38b7fc0df7ddc2b03ec781d9f0cb8a (patch) | |
| tree | e6832d12fd4f4a8120656ab07491cd0eb70de665 /src/import | |
| parent | f0a43eb821e7b6952977a92cd2ce8a2575f7101a (diff) | |
| parent | 707b3fbd5732c630d1fd0bab6f6e5b8f7130b322 (diff) | |
| download | systemd-871fa294ff38b7fc0df7ddc2b03ec781d9f0cb8a.tar.gz | |
Merge pull request #10935 from poettering/rlimit-nofile-safe
Merged by hand to resolve a trivial conflict in TODO.
Diffstat (limited to 'src/import')
| -rw-r--r-- | src/import/pull-common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/import/pull-common.c b/src/import/pull-common.c index a90693c802..acfe380969 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -14,6 +14,7 @@ #include "process-util.h" #include "pull-common.h" #include "pull-job.h" +#include "rlimit-util.h" #include "rm-rf.h" #include "signal-util.h" #include "siphash24.h" @@ -472,6 +473,8 @@ int pull_verify(PullJob *main_job, _exit(EXIT_FAILURE); } + (void) rlimit_nofile_safe(); + cmd[k++] = strjoina("--homedir=", gpg_home); /* We add the user keyring only to the command line |