1. openvpn
  2. Commit 5bde5b6d1875fd87b116c943084df0d2f6aee6d0
Browse code

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 <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>

David Sommerseth authored on 2017/06/19 22:05:07
Showing 1 changed files
src/openvpn/init.c
History View file @ 5bde5b6
... ... 
@@ -1382,6 +1382,8 @@ initialization_sequence_completed(struct context *c, const unsigned int flags)
1382 1382 
     /* If we delayed UID/GID downgrade or chroot, do it now */
1383 1383 
     do_uid_gid_chroot(c, true);
1384 1384
1385 
+
1386 
+#ifdef ENABLE_CRYPTO
1385 1387 
     /*
1386 1388 
      * In some cases (i.e. when receiving auth-token via
1387 1389 
      * push-reply) the auth-nocache option configured on the
... ... 
@@ -1393,6 +1395,7 @@ initialization_sequence_completed(struct context *c, const unsigned int flags)
1393 1393 
     {
1394 1394 
         delayed_auth_pass_purge();
1395 1395 
     }
1396 
+#endif /* ENABLE_CRYPTO */
1396 1397
1397 1398 
     /* Test if errors */
1398 1399 
     if (flags & ISC_ERRORS)