1. openvpn
  2. Commit 6383b362039f1dffe380903f571c275576cb38d3
Browse code

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

james authored on 2008/08/11 04:29:00
Showing 3 changed files
init.c
History View file @ 6383b36
... ... 
@@ -288,7 +288,7 @@ init_proxy (struct context *c, const int scope)
288 288 
 }
289 289
290 290 
 static inline void
291 
-uninit_proxy (struct context *c, const int scope)
291 
+uninit_proxy (struct context *c)
292 292 
 {
293 293 
 }
294 294
ntlm.c
History View file @ 6383b36
... ... 
@@ -256,7 +256,8 @@ ntlm_phase_3 (const struct http_proxy_info *p, const char *phase_2, struct gc_ar
256 256 
   }
257 257
258 258 
 	if (ntlmv2_enabled){ /* Generate NTLMv2 response */
259 
-
259 
+	        int tib_len;
260 
+
260 261 
 		/* NTLMv2 hash */
261 262 
 	        my_strupr((unsigned char *)strcpy(userdomain, username));
262 263 
 		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
276 276 
 		ntlmv2_blob[0x18]=0;                        /* Unknown, zero should work */
277 277
278 278 
 		/* Add target information block to the blob */
279 
-		int tib_len;
280 279 
 		if (( *((long *)&buf2[0x14]) & 0x00800000) == 0x00800000){ /* Check for Target Information block */
281 280 
 			tib_len = buf2[0x28];/* Get Target Information block size */
282 281 
 			if (tib_len > 96) tib_len = 96;
options.c
History View file @ 6383b36
... ... 
@@ -3249,9 +3249,9 @@ add_option (struct options *options,
3249 3249 
 	    struct env_set *es)
3250 3250 
 {
3251 3251 
   struct gc_arena gc = gc_new ();
3252 
-  ASSERT (MAX_PARMS >= 5);
3253 3252 
   const bool pull_mode = BOOL_CAST (permission_mask & OPT_P_PULL_MODE);
3254 3253
3254 
+  ASSERT (MAX_PARMS >= 5);
3255 3255 
   if (!file)
3256 3256 
     {
3257 3257 
       file = "[CMD-LINE]";