From ba84b55fb8d6737ca5e52063d93aaa087311bad0 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Wed, 20 Jan 2016 17:37:57 +0100 Subject: [PATCH] Fixed compilation issues in windows [dwmw2: Hide uid_csd and uid_csd_given too] Signed-off-by: Nikos Mavrogiannopoulos Signed-off-by: David Woodhouse --- dtls.c | 4 ++++ library.c | 2 ++ openconnect-internal.h | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dtls.c b/dtls.c index 9c91ec2f..a1a5a720 100644 --- a/dtls.c +++ b/dtls.c @@ -1265,6 +1265,7 @@ static int detect_mtu_ipv6(struct openconnect_info *vpninfo, unsigned char *buf) break; } while(max_resends-- > 0); +#ifndef _WIN32 /* If we received back our DPD packet, do nothing; otherwise, * attempt to get MTU from the ICMP6 packet we received */ if (ret <= 0) { @@ -1282,6 +1283,9 @@ static int detect_mtu_ipv6(struct openconnect_info *vpninfo, unsigned char *buf) } } } +#else + mtu6_fail: +#endif return cur; fail: diff --git a/library.c b/library.c index 45aa16b8..cc0aaed9 100644 --- a/library.c +++ b/library.c @@ -466,8 +466,10 @@ int openconnect_get_ip_info(struct openconnect_info *vpninfo, int openconnect_setup_csd(struct openconnect_info *vpninfo, uid_t uid, int silent, const char *wrapper) { +#ifndef _WIN32 vpninfo->uid_csd = uid; vpninfo->uid_csd_given = silent ? 2 : 1; +#endif STRDUP(vpninfo->csd_wrapper, wrapper); return 0; diff --git a/openconnect-internal.h b/openconnect-internal.h index 17102909..fbcbff56 100644 --- a/openconnect-internal.h +++ b/openconnect-internal.h @@ -399,10 +399,7 @@ struct openconnect_info { int nopasswd; int xmlpost; char *dtls_ciphers; - uid_t uid_csd; - gid_t gid_csd; char *csd_wrapper; - int uid_csd_given; int no_http_keepalive; int dump_http_traffic; @@ -538,6 +535,9 @@ struct openconnect_info { char *dtls_cipher; char *vpnc_script; #ifndef _WIN32 + int uid_csd_given; + uid_t uid_csd; + gid_t gid_csd; uid_t uid; gid_t gid; #endif