diff options
| author | Heiko Hund <heiko.hund@sophos.com> | 2012-07-30 11:05:22 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2012-07-30 15:49:55 +0200 |
| commit | 4f879daeb9b1b709c80d01e4872b30e23747c4a8 (patch) | |
| tree | 3e308349ca4dacb25654d18a26a7470af1dc189a /src/openvpn/proxy.c | |
| parent | 6dcb1265c601b53d2bb221f5087ef5ad2626f94b (diff) | |
| download | openvpn-4f879daeb9b1b709c80d01e4872b30e23747c4a8.tar.gz openvpn-4f879daeb9b1b709c80d01e4872b30e23747c4a8.tar.xz openvpn-4f879daeb9b1b709c80d01e4872b30e23747c4a8.zip | |
fix regression with --http-proxy[-*] options
Commit af1bf85a introducing the --management-query-proxy option
broke the initialization of HTTP proxy options by not assigning
the allocated object to the options element in the function
init_http_proxy_options_once().
Signed-off-by: Heiko Hund <heiko.hund@sophos.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: 1343639122-8658-1-git-send-email-heiko.hund@sophos.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/6913
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to 'src/openvpn/proxy.c')
| -rw-r--r-- | src/openvpn/proxy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/openvpn/proxy.c b/src/openvpn/proxy.c index 28ce019..363d8a7 100644 --- a/src/openvpn/proxy.c +++ b/src/openvpn/proxy.c @@ -47,17 +47,17 @@ #define UP_TYPE_PROXY "HTTP Proxy" struct http_proxy_options * -init_http_proxy_options_once (struct http_proxy_options *hpo, +init_http_proxy_options_once (struct http_proxy_options **hpo, struct gc_arena *gc) { - if (!hpo) + if (!*hpo) { - ALLOC_OBJ_CLEAR_GC (hpo, struct http_proxy_options, gc); + ALLOC_OBJ_CLEAR_GC (*hpo, struct http_proxy_options, gc); /* http proxy defaults */ - hpo->timeout = 5; - hpo->http_version = "1.0"; + (*hpo)->timeout = 5; + (*hpo)->http_version = "1.0"; } - return hpo; + return *hpo; } |