summaryrefslogtreecommitdiff
path: root/src/shared/pager.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-26 16:11:45 +0100
committerLennart Poettering <lennart@poettering.net>2018-12-01 12:50:45 +0100
commit0672e2c6f84e0999ead8ea662360eb6bb8effe4c (patch)
tree9431e15187526dfee77c1409934634b47e4e7925 /src/shared/pager.c
parent595225af7a4f663788d26b8720e994fed71f9410 (diff)
downloadsystemd-0672e2c6f84e0999ead8ea662360eb6bb8effe4c.tar.gz
tree-wide: use FORK_RLIMIT_NOFILE_SAFE wherever possible
Similar to the previous commit: in many cases no further fd processing needs to be done in forked of children before execve() or any of its flavours are called. In those case we can use FORK_RLIMIT_NOFILE_SAFE instead.
Diffstat (limited to 'src/shared/pager.c')
-rw-r--r--src/shared/pager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/pager.c b/src/shared/pager.c
index 86a394e4f8..d907a60119 100644
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -132,7 +132,7 @@ int pager_open(PagerFlags flags) {
if (flags & PAGER_JUMP_TO_END)
less_opts = strjoina(less_opts, " +G");
- r = safe_fork("(pager)", FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_LOG, &pager_pid);
+ r = safe_fork("(pager)", FORK_RESET_SIGNALS|FORK_DEATHSIG|FORK_RLIMIT_NOFILE_SAFE|FORK_LOG, &pager_pid);
if (r < 0)
return r;
if (r == 0) {
@@ -257,7 +257,7 @@ int show_man_page(const char *desc, bool null_stdio) {
} else
args[1] = desc;
- r = safe_fork("(man)", FORK_RESET_SIGNALS|FORK_DEATHSIG|(null_stdio ? FORK_NULL_STDIO : 0)|FORK_LOG, &pid);
+ r = safe_fork("(man)", FORK_RESET_SIGNALS|FORK_DEATHSIG|(null_stdio ? FORK_NULL_STDIO : 0)|FORK_RLIMIT_NOFILE_SAFE|FORK_LOG, &pid);
if (r < 0)
return r;
if (r == 0) {