summaryrefslogtreecommitdiff
path: root/usr.bin/sudo/sudo_edit.c
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2008-07-31 16:44:05 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2008-07-31 16:44:05 +0000
commitdaf52ae7d678fa3f43b85be9091b54cbcd05a4fe (patch)
tree222e97fd4aba175d8178530baff52eed106a060a /usr.bin/sudo/sudo_edit.c
parent6960c6b7f96163e79aa75b0ef330c8c13fc523bd (diff)
Update to sudo 1.6.9p17
Diffstat (limited to 'usr.bin/sudo/sudo_edit.c')
-rw-r--r--usr.bin/sudo/sudo_edit.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/sudo/sudo_edit.c b/usr.bin/sudo/sudo_edit.c
index 50759996518..5ed8e66ce92 100644
--- a/usr.bin/sudo/sudo_edit.c
+++ b/usr.bin/sudo/sudo_edit.c
@@ -62,10 +62,10 @@
#include "sudo.h"
#ifndef lint
-__unused static const char rcsid[] = "$Sudo: sudo_edit.c,v 1.6.2.8 2007/09/03 20:28:31 millert Exp $";
+__unused static const char rcsid[] = "$Sudo: sudo_edit.c,v 1.6.2.9 2008/06/21 00:47:52 millert Exp $";
#endif /* lint */
-extern sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld;
+extern sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp;
extern char **environ;
/*
@@ -231,11 +231,10 @@ int sudo_edit(argc, argv, envp)
nargv[ac++] = tf[i++].tfile;
nargv[ac] = NULL;
- /* We wait for our own children and can be suspended. */
+ /* Allow the editor to be suspended. */
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sa.sa_handler = SIG_DFL;
- (void) sigaction(SIGCHLD, &sa, NULL);
(void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
/*
@@ -251,7 +250,6 @@ int sudo_edit(argc, argv, envp)
/* child */
(void) sigaction(SIGINT, &saved_sa_int, NULL);
(void) sigaction(SIGQUIT, &saved_sa_quit, NULL);
- (void) sigaction(SIGCHLD, &saved_sa_chld, NULL);
set_perms(PERM_FULL_USER);
endpwent();
endgrent();