OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 21:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

auth-token with auth-nocache fix broke --disable-crypto builds

Browse Source 
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 <davids@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
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 <davids@openvpn.net>
(cherry picked from commit 5bde5b6d1875fd87b116c943084df0d2f6aee6d0)
This commit is contained in:
David Sommerseth 2017-06-19 15:05:07 +02:00
parent 199ef1321c
commit 888b0dcee0
No known key found for this signature in database
GPG Key ID: 86CF944C9671FDF2
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openvpn/init.c
View File

@ -1253,6 +1253,8 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)
/* If we delayed UID/GID downgrade or chroot, do it now */ /* If we delayed UID/GID downgrade or chroot, do it now */
do_uid_gid_chroot (c, true); do_uid_gid_chroot (c, true);
#ifdef ENABLE_CRYPTO
/* /*
* In some cases (i.e. when receiving auth-token via * In some cases (i.e. when receiving auth-token via
* push-reply) the auth-nocache option configured on the * push-reply) the auth-nocache option configured on the
@ -1264,6 +1266,7 @@ initialization_sequence_completed (struct context *c, const unsigned int flags)
{ {
delayed_auth_pass_purge(); delayed_auth_pass_purge();
} }
#endif /* ENABLE_CRYPTO */
/* Test if errors */ /* Test if errors */
if (flags & ISC_ERRORS) if (flags & ISC_ERRORS)