summaryrefslogtreecommitdiff
path: root/lib/socks_sspi.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-01-29 14:00:18 +0000
committerYang Tse <yangsita@gmail.com>2009-01-29 14:00:18 +0000
commit996c8ca7c29dcce23b9acb253b9acbefcc701bd1 (patch)
tree7666f02910174e312c26b5fa8eb45afdc055f844 /lib/socks_sspi.c
parentfec65fbff6b204034b4ce9af7cc2aa468505c279 (diff)
downloadcurl-996c8ca7c29dcce23b9acb253b9acbefcc701bd1.tar.gz
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
Diffstat (limited to 'lib/socks_sspi.c')
-rw-r--r--lib/socks_sspi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c
index c6810c734..3318794c6 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>
@@ -46,6 +45,12 @@
#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.
*/
static int check_sspi_err(struct SessionHandle *data,