diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-09-05 14:43:47 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-09-05 14:43:47 +0000 |
| commit | cd17a7c1dffcd219aff11740df706ceeee1e38cf (patch) | |
| tree | 7894ec6c4db90aed4566d96eb844552f4b29b45d | |
| parent | 49a3d4618eb5e25c1cadb3f23c808c8f091cea98 (diff) | |
| download | neon-cd17a7c1dffcd219aff11740df706ceeee1e38cf.tar.gz | |
Merge r1055, r1058, r1062, r1063, r1064 from trunk:
* src/ne_openssl.c (ne__ssl_init): Call CRYPTO_malloc_init() first per
dev@apr discussion.
* config.hw.in: Enable debugging for Win32 build.
* src/ne_sspi.c (ne_sspi_clear_context): Add missing return statement;
patch from Kiyo Kelvin Lee.
* src/ne_sspi.c (resetContext): Fix build with older SDKs (Kiyo Kelvin Lee).
* config.hw.in: Fixes for newer SDKs; patch from Kiyo Kelvin Lee.
git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.26.x@1066 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
| -rw-r--r-- | config.hw.in | 8 | ||||
| -rw-r--r-- | src/ne_openssl.c | 1 | ||||
| -rw-r--r-- | src/ne_sspi.c | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/config.hw.in b/config.hw.in index 21ac0c4..6a73caf 100644 --- a/config.hw.in +++ b/config.hw.in @@ -39,6 +39,9 @@ #define HAVE_SSPI +/* Define to enable debugging */ +#define NE_DEBUGGING 1 + #define NE_FMT_SIZE_T "u" #define NE_FMT_SSIZE_T "d" #define NE_FMT_OFF_T "ld" @@ -50,8 +53,13 @@ /* Win32 uses a underscore, so we use a macro to eliminate that. */ #define snprintf _snprintf #define vsnprintf _vsnprintf +#if defined(_MSC_VER) && _MSC_VER >= 1400 +#define strcasecmp _strcmpi +#define strncasecmp _strnicmp +#else #define strcasecmp strcmpi #define strncasecmp strnicmp +#endif #define ssize_t int #define inline __inline #define off_t _off_t diff --git a/src/ne_openssl.c b/src/ne_openssl.c index 48ca135..df85937 100644 --- a/src/ne_openssl.c +++ b/src/ne_openssl.c @@ -1001,6 +1001,7 @@ static void thread_lock_neon(int mode, int n, const char *file, int line) int ne__ssl_init(void) { + CRYPTO_malloc_init(); SSL_load_error_strings(); SSL_library_init(); OpenSSL_add_all_algorithms(); diff --git a/src/ne_sspi.c b/src/ne_sspi.c index dde9a04..f997715 100644 --- a/src/ne_sspi.c +++ b/src/ne_sspi.c @@ -362,7 +362,11 @@ int ne_sspi_create_context(void **context, char *serverName, int ntlm) static void resetContext(SSPIContext * sspiContext) { pSFT->DeleteSecurityContext(&(sspiContext->context)); +#if defined(_MSC_VER) && _MSC_VER <= 1200 + pSFT->FreeCredentialHandle(&(sspiContext->credentials)); +#else pSFT->FreeCredentialsHandle(&(sspiContext->credentials)); +#endif sspiContext->continueNeeded = 0; } @@ -424,6 +428,7 @@ int ne_sspi_clear_context(void *context) return status; } sspiContext->authfinished = 0; + return 0; } /* * Processes received authentication tokens as well as supplies the |