Fixed compiling issues when using --disable-crypto

Peter Korsgaard <jacmet@sunsite.dk> reported an issue [1] when compiling
with --disable-crypto activated.  He suggested a patch, which only
partly solved the issue.  SVN r6568 / commit 3cf9dd88fd84108 added a
new feature which further made it impossible to compile without crypto.

This patch fixes both issues, based on Peter Korsgaard's patch.

[1] <http://sourceforge.net/mailarchive/forum.php?thread_name=87fwx08bod.fsf%40macbook.be.48ers.dk&forum_name=openvpn-devel>

Signed-off-by: James Yonan <james@openvpn.net>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

diff --git a/base64.c b/base64.c
index 2cc39444e90af7ea872186214c3b49e29054908e..3449ae58a3783ef8e08cc02c49a36498918a904b 100644 (file)
--- a/base64.c
+++ b/base64.c
@@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str)
     return strlen(s);
 }
 
-#if NTLM
-
 static int 
 pos(char c)
 {
@@ -137,8 +135,6 @@ base64_decode(const char *str, void *data)
     return q - (unsigned char *) data;
 }
 
-#endif /* NTLM, PKCS#11 */
-
 #else
 static void dummy(void) {}
-#endif
+#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */

diff --git a/options.c b/options.c
index a717e1e266547c06a33c804cf8ef2ac4458fcee5..e4c3c2ec9c5aa7fded069491b6847e8313a6b2cd 100644 (file)
--- a/options.c
+++ b/options.c
@@ -45,6 +45,7 @@
 #include "pool.h"
 #include "helper.h"
 #include "manage.h"
+#include "forward.h"
 
 #include "memdbg.h"