36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From 205775f73f7eef7b207acccac6b853562adf604b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Date: Fri, 25 Oct 2019 20:25:36 +0000
|
||
|
|
Subject: [PATCH] Don't close STDERR when submitting request
|
||
|
|
|
||
|
|
cm_subproc_mark_most_cloexec() now closes all open file
|
||
|
|
descriptors except for up to three requested for stdin, stdout
|
||
|
|
and stderr. Before the optimization those three were always
|
||
|
|
left open.
|
||
|
|
|
||
|
|
This was causing errors in the IPA helper ipa-server-guard
|
||
|
|
because it tries to display the contents of stderr which was
|
||
|
|
always being closed, causing ipa-server-guard to blow up.
|
||
|
|
---
|
||
|
|
src/submit-e.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/submit-e.c b/src/submit-e.c
|
||
|
|
index d6158d7a..69b4f8e2 100644
|
||
|
|
--- a/src/submit-e.c
|
||
|
|
+++ b/src/submit-e.c
|
||
|
|
@@ -941,8 +941,8 @@ cm_submit_e_helper_main(int fd, struct cm_store_ca *ca,
|
||
|
|
}
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
- cm_log(2, "Redirecting stdin and stderr to /dev/null, leaving stdout open for child \"%s\".\n", argv[0]);
|
||
|
|
- cm_subproc_mark_most_cloexec(STDOUT_FILENO, -1, -1);
|
||
|
|
+ cm_log(2, "Redirecting stdin to /dev/null, leaving stdout and stderr open for child \"%s\".\n", argv[0]);
|
||
|
|
+ cm_subproc_mark_most_cloexec(STDOUT_FILENO, STDERR_FILENO, -1);
|
||
|
|
cm_log(1, "Running enrollment helper \"%s\".\n", argv[0]);
|
||
|
|
execvp(argv[0], argv);
|
||
|
|
u = errno;
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|