diff options
| author | James Yonan <james@openvpn.net> | 2011-04-25 04:58:34 +0000 |
|---|---|---|
| committer | James Yonan <james@openvpn.net> | 2011-04-25 04:58:34 +0000 |
| commit | 094f0305f9908210e204c66462e444fdef942b45 (patch) | |
| tree | 97e65f4bb5d010a61a1fbb99d7253ac5350550fb /init.c | |
| parent | 893f4f9328de797f7bf6e6199bdceb278f87d453 (diff) | |
| download | openvpn-094f0305f9908210e204c66462e444fdef942b45.tar.gz openvpn-094f0305f9908210e204c66462e444fdef942b45.tar.xz openvpn-094f0305f9908210e204c66462e444fdef942b45.zip | |
Added new "extra-certs" and "verify-hash" options (see man page for
details).
Increase the timeout after SIGUSR1 restart when restart is not
due to server_poll_timeout.
Version 2.1.3v
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@7215 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'init.c')
| -rw-r--r-- | init.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1706,9 +1706,11 @@ socket_restart_pause (struct context *c) if (auth_retry_get () == AR_NOINTERACT) sec = 10; +#if 0 /* not really needed because of c->persist.restart_sleep_seconds */ if (c->options.server_poll_timeout && sec > 1) sec = 1; #endif +#endif if (c->persist.restart_sleep_seconds > 0 && c->persist.restart_sleep_seconds > sec) sec = c->persist.restart_sleep_seconds; @@ -2057,6 +2059,7 @@ do_init_crypto_tls (struct context *c, const unsigned int flags) to.ns_cert_type = options->ns_cert_type; memmove (to.remote_cert_ku, options->remote_cert_ku, sizeof (to.remote_cert_ku)); to.remote_cert_eku = options->remote_cert_eku; + to.verify_hash = options->verify_hash; to.es = c->c2.es; #ifdef ENABLE_DEBUG |