From: David Sommerseth Date: Mon, 19 Jun 2017 13:05:07 +0000 (+0200) Subject: auth-token with auth-nocache fix broke --disable-crypto builds X-Git-Tag: v2.5_beta1~661 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bde5b6d1875fd87b116c943084df0d2f6aee6d0;p=thirdparty%2Fopenvpn.git auth-token with auth-nocache fix broke --disable-crypto builds After adding commit 571165360db0392fa83e, it broke builds where the --disable-crypto was used with ./configure. This was due to the delayed_auth_pass_purge() which requires the crypto code paths being called from init.c without the proper #ifdef encapsulation. Signed-off-by: David Sommerseth Acked-by: Gert Doering Message-Id: <20170619130507.13892-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14883.html Signed-off-by: David Sommerseth --- diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 0832f1d1b..a54307ad3 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -1382,6 +1382,8 @@ initialization_sequence_completed(struct context *c, const unsigned int flags) /* If we delayed UID/GID downgrade or chroot, do it now */ do_uid_gid_chroot(c, true); + +#ifdef ENABLE_CRYPTO /* * In some cases (i.e. when receiving auth-token via * push-reply) the auth-nocache option configured on the @@ -1393,6 +1395,7 @@ initialization_sequence_completed(struct context *c, const unsigned int flags) { delayed_auth_pass_purge(); } +#endif /* ENABLE_CRYPTO */ /* Test if errors */ if (flags & ISC_ERRORS)