Remove use of the non-standard SA_INTERRUPT

diff --git a/include/sudo_compat.h b/include/sudo_compat.h
index 1c123838349c70d104c0dcd51b04e37e5e6cef1e..f265123a6b23f8014a8734be830cd9d8c8029728 100644 (file)
--- a/include/sudo_compat.h
+++ b/include/sudo_compat.h
@@ -250,17 +250,10 @@ __dso_public int isblank(int);
 
 /*
  * 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
 typedef struct sigaction sigaction_t;
 #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

diff --git a/plugins/sudoers/timestamp.c b/plugins/sudoers/timestamp.c
index 34600f84a0c867c74d741686261fccdbcf143669..8c2b0c7bdc185c00466d773301e3d058f555bba3 100644 (file)
--- a/plugins/sudoers/timestamp.c
+++ b/plugins/sudoers/timestamp.c
@@ -465,7 +465,7 @@ timestamp_lock_record(int fd, off_t pos, off_t len)
     got_signal = 0;
     memset(&sa, 0, sizeof(sa));
     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;
     (void) sigaction(SIGINT, &sa, &saveint);
     (void) sigaction(SIGQUIT, &sa, &savequit);

diff --git a/src/tcsetpgrp_nobg.c b/src/tcsetpgrp_nobg.c
index 7179fc7f055c74bc9d9693344b1f7d9a562dcbd2..f982cef9e5224aa36976e4a57b5da51a9c78ea91 100644 (file)
--- a/src/tcsetpgrp_nobg.c
+++ b/src/tcsetpgrp_nobg.c
@@ -60,7 +60,7 @@ tcsetpgrp_nobg(int fd, pid_t pgrp_id)
      */
     memset(&sa, 0, sizeof(sa));
     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;
     got_sigttou = 0;
     (void)sigaction(SIGTTOU, &sa, &osa);

diff --git a/src/tgetpass.c b/src/tgetpass.c
index c84f5de126c24102d7250e202624df4638614037..c44ab5f5b17d2162bcb05aa6c84c45c3db81f965 100644 (file)
--- a/src/tgetpass.c
+++ b/src/tgetpass.c
@@ -157,7 +157,7 @@ restart:
      */
     memset(&sa, 0, sizeof(sa));
     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;
     (void) sigaction(SIGALRM, &sa, &savealrm);
     (void) sigaction(SIGINT, &sa, &saveint);