Commit 996c8ca7 authored by Yang Tse's avatar Yang Tse
Browse files

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
parent fec65fbf

lib/socks_sspi.c

+6 −1
Original line number Diff line number Diff line
@@ -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.

 */