Merge pull request #10935 from poettering/rlimit-nofile-safe

Merged by hand to resolve a trivial conflict in TODO.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-12-06 17:19:21 +01:00
29 changed files with 124 additions and 41 deletions
+3
View File
@@ -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