oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

kinit: w/ command ignore SIGINT/SIGQUIT (fix #1077)

Browse Source
This commit is contained in:
Nicolas Williams
2023-02-06 17:40:33 -06:00
parent bcbe816962
commit d280a83ebe
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kuser/kinit.c
View File

@@ -1263,16 +1263,18 @@ update_siginfo_msg(time_t exp, const char *srv)
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
static void static void
handle_siginfo(int sig) handler(int sig)
{ {
struct iovec iov[2]; if (sig == SIGINFO) {
struct iovec iov[2];
iov[0].iov_base = rk_UNCONST(siginfo_msg); iov[0].iov_base = rk_UNCONST(siginfo_msg);
iov[0].iov_len = strlen(siginfo_msg); iov[0].iov_len = strlen(siginfo_msg);
iov[1].iov_base = "\n"; iov[1].iov_base = "\n";
iov[1].iov_len = 1; iov[1].iov_len = 1;
writev(STDERR_FILENO, iov, sizeof(iov)/sizeof(iov[0])); writev(STDERR_FILENO, iov, sizeof(iov)/sizeof(iov[0]));
} /* else ignore interrupts; our progeny will not ignore them */
} }
#endif #endif
@@ -1890,9 +1892,11 @@ main(int argc, char **argv)
#ifdef HAVE_SIGACTION #ifdef HAVE_SIGACTION
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_handler = handle_siginfo; sa.sa_handler = handler;
sigaction(SIGINFO, &sa, NULL); sigaction(SIGINFO, &sa, NULL);
sigaction(SIGINT, &sa, NULL);
sigaction(SIGQUIT, &sa, NULL);
#endif #endif
ret = simple_execvp_timed(argv[1], argv+1, ret = simple_execvp_timed(argv[1], argv+1,