summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-08-10 19:29:00 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-08-10 19:29:00 +0000
commit6383b362039f1dffe380903f571c275576cb38d3 (patch)
treed797b46f9bb6cac6e994e057e8f28aca460d10e6
parentcbaf1991e44949000fc91d260ed45c3bb5e0aafd (diff)
downloadopenvpn-6383b362039f1dffe380903f571c275576cb38d3.zip
openvpn-6383b362039f1dffe380903f571c275576cb38d3.tar.gz
openvpn-6383b362039f1dffe380903f571c275576cb38d3.tar.xz
Fixed build issue with ./configure --disable-socks --disable-http.
Fixed separate compile errors in options.c and ntlm.c that occur on strict C compilers (such as old versions of gcc) that require that C variable declarations occur at the start of a {} block, not in the middle. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3219 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--init.c2
-rw-r--r--ntlm.c4
-rw-r--r--options.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/init.c b/init.c
index 5bd8cf6..08918d6 100644
--- a/init.c
+++ b/init.c
@@ -288,7 +288,7 @@ init_proxy (struct context *c, const int scope)
}
static inline void
-uninit_proxy (struct context *c, const int scope)
+uninit_proxy (struct context *c)
{
}
diff --git a/ntlm.c b/ntlm.c
index 558cd1b..62fe43c 100644
--- a/ntlm.c
+++ b/ntlm.c
@@ -256,7 +256,8 @@ ntlm_phase_3 (const struct http_proxy_info *p, const char *phase_2, struct gc_ar
}
if (ntlmv2_enabled){ /* Generate NTLMv2 response */
-
+ int tib_len;
+
/* NTLMv2 hash */
my_strupr((unsigned char *)strcpy(userdomain, username));
if (strlen(username) + strlen(domain) < sizeof(userdomain))
@@ -276,7 +277,6 @@ ntlm_phase_3 (const struct http_proxy_info *p, const char *phase_2, struct gc_ar
ntlmv2_blob[0x18]=0; /* Unknown, zero should work */
/* Add target information block to the blob */
- int tib_len;
if (( *((long *)&buf2[0x14]) & 0x00800000) == 0x00800000){ /* Check for Target Information block */
tib_len = buf2[0x28];/* Get Target Information block size */
if (tib_len > 96) tib_len = 96;
diff --git a/options.c b/options.c
index ccbbffa..69f3731 100644
--- a/options.c
+++ b/options.c
@@ -3249,9 +3249,9 @@ add_option (struct options *options,
struct env_set *es)
{
struct gc_arena gc = gc_new ();
- ASSERT (MAX_PARMS >= 5);
const bool pull_mode = BOOL_CAST (permission_mask & OPT_P_PULL_MODE);
+ ASSERT (MAX_PARMS >= 5);
if (!file)
{
file = "[CMD-LINE]";