aboutsummaryrefslogtreecommitdiffstats
path: root/src/charon-cmd/charon-cmd.c
diff options
context:
space:
mode:
authorMartin Willi <martin@revosec.ch>2014-02-06 15:58:41 +0100
committerMartin Willi <martin@revosec.ch>2014-02-06 15:58:41 +0100
commitfe40c4754767bda0fadb1a83ec9ab6af0125b488 (patch)
treef83b00cfaccca7795bf5a4bb5cca27e0c5a3cc70 /src/charon-cmd/charon-cmd.c
parent0edd13b6c85af9baa2d870e82b796f11c5020857 (diff)
parente2de972c55c882274a826926aac414ae432740ae (diff)
downloadstrongswan-fe40c4754767bda0fadb1a83ec9ab6af0125b488.tar.bz2
strongswan-fe40c4754767bda0fadb1a83ec9ab6af0125b488.tar.xz
Merge branch 'cmd-proposals'
Introduce --ike/esp/ah-proposal options to offer custom proposals, and requests an IPv6 virtual IP if an IPv6 --remote-ts is given. Fixes #508.
Diffstat (limited to 'src/charon-cmd/charon-cmd.c')
-rw-r--r--src/charon-cmd/charon-cmd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index 5f4787b58..0c24fd146 100644
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -389,6 +389,7 @@ int main(int argc, char *argv[])
sigaddset(&action.sa_mask, SIGINT);
sigaddset(&action.sa_mask, SIGTERM);
sigaddset(&action.sa_mask, SIGHUP);
+ sigaddset(&action.sa_mask, SIGUSR1);
sigaction(SIGSEGV, &action, NULL);
sigaction(SIGILL, &action, NULL);
sigaction(SIGBUS, &action, NULL);