summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-12-22 15:10:56 +0100
committerLennart Poettering <lennart@poettering.net>2017-12-25 11:48:21 +0100
commit0adc28ceecab2fad2fe74d13d58657dfceddd4c3 (patch)
treed658322db4b0fbd159858d5fda856c8e67059a15
parent78752f2eb4abfee3cd09ef96f8e6c745290aa42b (diff)
downloadsystemd-0adc28ceecab2fad2fe74d13d58657dfceddd4c3.tar.gz
agents: use kill_and_sigcont() where appropriate
-rw-r--r--src/shared/spawn-ask-password-agent.c3
-rw-r--r--src/shared/spawn-polkit-agent.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index a99c467db3..17785fd153 100644
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -57,8 +57,7 @@ void ask_password_agent_close(void) {
return;
/* Inform agent that we are done */
- (void) kill(agent_pid, SIGTERM);
- (void) kill(agent_pid, SIGCONT);
+ (void) kill_and_sigcont(agent_pid, SIGTERM);
(void) wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index c6bd65eb71..886248b9f9 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -83,9 +83,7 @@ void polkit_agent_close(void) {
return;
/* Inform agent that we are done */
- (void) kill(agent_pid, SIGTERM);
- (void) kill(agent_pid, SIGCONT);
-
+ (void) kill_and_sigcont(agent_pid, SIGTERM);
(void) wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}