From: David Sommerseth <dazo@users.sourceforge.net>
Date: Fri, 12 Nov 2010 23:55:02 +0000 (+0100)
Subject: Merge branch 'feat_misc' into beta2.2
X-Git-Tag: v2.2-beta4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aa664cef51e4b4ed4b35e569925acb4fd7b9b52;p=thirdparty%2Fopenvpn.git

Merge branch 'feat_misc' into beta2.2

Conflicts:
	Makefile.am
	openvpn.8
	options.c
	socket.c
	ssl.c
	- feat_misc is missing a lot of bugfix2.1 changes

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

1aa664cef51e4b4ed4b35e569925acb4fd7b9b52
diff --cc options.h
index cb29d797d,9a331d810..c51a10dfc
--- a/options.h
+++ b/options.h
@@@ -95,16 -95,9 +95,17 @@@ struct connection_entr
  #ifdef ENABLE_SOCKS
    const char *socks_proxy_server;
    int socks_proxy_port;
+   const char *socks_proxy_authfile;
    bool socks_proxy_retry;
  #endif
 +
 +# define CE_DISABLED (1<<0)
 +#if HTTP_PROXY_FALLBACK
 +# define CE_HTTP_PROXY_FALLBACK (1<<1)
 +  time_t ce_http_proxy_fallback_timestamp; /* time when fallback http_proxy_options was last updated */
 +#endif
 +
 +  unsigned int flags;
  };
  
  struct remote_entry