diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2015-11-18 15:19:06 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2015-11-18 15:19:06 +0100 |
| commit | fb6324eb165d1577bc4541bc2fc6758c56da2a95 (patch) | |
| tree | afbc98168e056e7839ac0dc434db8f88ffb34833 /src/charon | |
| parent | ea6a577e967da0ee954b06b7bdc6796e97eb9b2b (diff) | |
| parent | 1e980d6be0ef0e243c6fe82b5e855454b97e24a4 (diff) | |
| download | vyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.tar.gz vyos-strongswan-fb6324eb165d1577bc4541bc2fc6758c56da2a95.zip | |
Merge tag 'upstream/5.3.4'
Upstream version 5.3.4
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/charon.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/charon/charon.c b/src/charon/charon.c index 081e49490..f03b6e1ba 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -17,9 +17,7 @@ */ #include <stdio.h> -#define _POSIX_PTHREAD_SEMANTICS /* for two param sigwait on OpenSolaris */ #include <signal.h> -#undef _POSIX_PTHREAD_SEMANTICS #include <pthread.h> #include <sys/stat.h> #include <sys/types.h> @@ -110,12 +108,11 @@ static void run() while (TRUE) { int sig; - int error; - error = sigwait(&set, &sig); - if (error) + sig = sigwaitinfo(&set, NULL); + if (sig == -1) { - DBG1(DBG_DMN, "error %d while waiting for a signal", error); + DBG1(DBG_DMN, "waiting for signal failed: %s", strerror(errno)); return; } switch (sig) @@ -434,7 +431,7 @@ int main(int argc, char *argv[]) } /* add handler for SEGV and ILL, - * INT, TERM and HUP are handled by sigwait() in run() */ + * INT, TERM and HUP are handled by sigwaitinfo() in run() */ action.sa_handler = segv_handler; action.sa_flags = 0; sigemptyset(&action.sa_mask); |