aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Yonan <james@openvpn.net>2010-11-14 23:38:47 +0100
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-11-14 23:38:47 +0100
commit423d68b0ede7f10c02fa753cba8d60d2218d2dc7 (patch)
tree751ac1dea4199f4f96973e9376c6b05af7025b8d
parentRemove hardcoded path to resolvconf (diff)
downloadopenvpn-423d68b0ede7f10c02fa753cba8d60d2218d2dc7.tar.xz
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>
Diffstat (limited to '')
-rw-r--r--base64.c6
-rw-r--r--options.c1
2 files changed, 2 insertions, 5 deletions
diff --git a/base64.c b/base64.c
index 2cc3944..3449ae5 100644
--- 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 a717e1e..e4c3c2e 100644
--- 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"