isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove use of the non-standard SA_INTERRUPT

Browse Source
This commit is contained in:
Todd C. Miller
2017-05-12 10:02:17 -06:00
parent 9c3783a175
commit b5c88e52b1
4 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/sudo_compat.h
View File

@@ -250,17 +250,10 @@ __dso_public int isblank(int);
/* /*
* Add IRIX-like sigaction_t for those without it. * Add IRIX-like sigaction_t for those without it.
* SA_RESTART is not required by POSIX; SunOS has SA_INTERRUPT instead.
*/ */
#ifndef HAVE_SIGACTION_T #ifndef HAVE_SIGACTION_T
typedef struct sigaction sigaction_t; typedef struct sigaction sigaction_t;
#endif #endif
#ifndef SA_INTERRUPT
# define SA_INTERRUPT 0
#endif
#ifndef SA_RESTART
# define SA_RESTART 0
#endif
/* /*
* The nitems macro may be defined in sys/param.h * The nitems macro may be defined in sys/param.h

2
plugins/sudoers/timestamp.c
View File

@@ -465,7 +465,7 @@ timestamp_lock_record(int fd, off_t pos, off_t len)
got_signal = 0; got_signal = 0;
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_INTERRUPT; /* don't restart system calls */ sa.sa_flags = 0; /* don't restart system calls */
sa.sa_handler = timestamp_handler; sa.sa_handler = timestamp_handler;
(void) sigaction(SIGINT, &sa, &saveint); (void) sigaction(SIGINT, &sa, &saveint);
(void) sigaction(SIGQUIT, &sa, &savequit); (void) sigaction(SIGQUIT, &sa, &savequit);

2
src/tcsetpgrp_nobg.c
View File

@@ -60,7 +60,7 @@ tcsetpgrp_nobg(int fd, pid_t pgrp_id)
*/ */
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_INTERRUPT; /* do not restart syscalls */ sa.sa_flags = 0; /* do not restart syscalls */
sa.sa_handler = sigttou; sa.sa_handler = sigttou;
got_sigttou = 0; got_sigttou = 0;
(void)sigaction(SIGTTOU, &sa, &osa); (void)sigaction(SIGTTOU, &sa, &osa);

2
src/tgetpass.c
View File

@@ -157,7 +157,7 @@ restart:
*/ */
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_INTERRUPT; /* don't restart system calls */ sa.sa_flags = 0; /* don't restart system calls */
sa.sa_handler = tgetpass_handler; sa.sa_handler = tgetpass_handler;
(void) sigaction(SIGALRM, &sa, &savealrm); (void) sigaction(SIGALRM, &sa, &savealrm);
(void) sigaction(SIGINT, &sa, &saveint); (void) sigaction(SIGINT, &sa, &saveint);