From: Yang Tse <yangsita@gmail.com>
Date: Thu, 29 Jan 2009 14:00:18 +0000 (+0000)
Subject: Avoid inclusion of ntsecapi.h and directly provide the KERB_WRAP_NO_ENCRYPT
X-Git-Tag: curl-7_19_4~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=996c8ca7c29dcce23b9acb253b9acbefcc701bd1;p=thirdparty%2Fcurl.git

Avoid inclusion of ntsecapi.h and directly provide the KERB_WRAP_NO_ENCRYPT
definition to avoid a 'STRING' duplicate definition from OpenSSL's safestack.h
---

diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index c6810c734f..3318794c6d 100644
--- a/lib/socks_sspi.c
+++ b/lib/socks_sspi.c
@@ -25,7 +25,6 @@
 #include "setup.h"
 
 #ifdef USE_WINDOWS_SSPI
-#include <ntsecapi.h>
 
 #include <string.h>
 
@@ -45,6 +44,12 @@
 /* The last #include file should be: */
 #include "memdebug.h"
 
+/*
+ * Definitions required from ntsecapi.h are directly provided below this point
+ * to avoid including ntsecapi.h due to a conflict with OpenSSL's safestack.h
+ */
+#define KERB_WRAP_NO_ENCRYPT 0x80000001
+
 /*
  * Helper sspi error functions.
  */