From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 30 Jul 2017 21:19:19 +0000 (+0200)
Subject: urldata.h: move SSPI-specific #include to correct location
X-Git-Tag: curl-7_56_0~176
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20c6cf7e951e70d4c456bd4171b9f25f04f23a87;p=thirdparty%2Fcurl.git

urldata.h: move SSPI-specific #include to correct location

In 86b889485 (sasl_gssapi: Added GSS-API based Kerberos V5 variables,
2014-12-03), an SSPI-specific field was added to the kerberos5data
struct without moving the #include "curl_sspi.h" later in the same file.

This broke the build when SSPI was enabled, unless Secure Channel was
used as SSL backend, because it just so happens that Secure Channel also
requires "curl_sspi.h" to be #included.

In f4739f639 (urldata: include curl_sspi.h when Windows SSPI is enabled,
2017-02-21), this bug was fixed incorrectly: Instead of moving the
appropriate conditional #include, the Secure Channel-conditional part
was now also SSPI-conditional.

Fix this problem by moving the correct #include instead.

This is also required for an upcoming patch that moves all the Secure
Channel-specific stuff out of urldata.h and encapsulates it properly in
vtls/schannel.c instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

diff --git a/lib/urldata.h b/lib/urldata.h
index 67f8e69e96..0d0010fa7f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -407,6 +407,10 @@ struct curl_ssl_session {
   struct ssl_primary_config ssl_config; /* setup for this session */
 };
 
+#ifdef USE_WINDOWS_SSPI
+#include "curl_sspi.h"
+#endif
+
 /* Struct used for Digest challenge-response authentication */
 struct digestdata {
 #if defined(USE_WINDOWS_SSPI)
@@ -438,10 +442,6 @@ typedef enum {
   NTLMSTATE_LAST
 } curlntlm;
 
-#ifdef USE_WINDOWS_SSPI
-#include "curl_sspi.h"
-#endif
-
 #if defined(CURL_DOES_CONVERSIONS) && defined(HAVE_ICONV)
 #include <iconv.h>
 #endif