diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2010-09-22 19:25:52 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2010-09-22 19:25:52 +0000 |
| commit | da757cba8a2a74ea0d0f7ac325fa6bc75f01706e (patch) | |
| tree | 05e605e943331917e5a7d827b1436b7415145600 | |
| parent | 8c0423d842704f4471e4a6db3d35d329bca0285b (diff) | |
| download | neon-da757cba8a2a74ea0d0f7ac325fa6bc75f01706e.tar.gz | |
Merge r1802, r1805 from trunk:
* macros/neon.m4 (NE_CHECK_FUNCS): Fix AI_ADDRCONFIG detection.
* src/ne_auth.c (ah_post_send): Always clear the SSPI context.
(Danil Shopyrin)
git-svn-id: http://svn.webdav.org/repos/projects/neon/branches/0.29.x@1806 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | macros/neon.m4 | 3 | ||||
| -rw-r--r-- | src/ne_auth.c | 4 |
3 files changed, 6 insertions, 3 deletions
@@ -1,6 +1,6 @@ Changes in release 0.29.4: -* Fix possible Solaris linker errors if building static library. * Fix SNI support (Tobias Gruetzmacher). +* Fix possible Solaris linker errors if building static library. Changes in release 0.29.3: * Change ne_sock_close() to no longer wait for SSL closure alert: diff --git a/macros/neon.m4 b/macros/neon.m4 index 9e6bcce..dccca95 100644 --- a/macros/neon.m4 +++ b/macros/neon.m4 @@ -653,7 +653,8 @@ if test $ne_enable_gai = yes; then NE_ENABLE_SUPPORT(IPV6, [IPv6 support is enabled]) AC_DEFINE(USE_GETADDRINFO, 1, [Define if getaddrinfo() should be used]) AC_CACHE_CHECK([for working AI_ADDRCONFIG], [ne_cv_gai_addrconfig], [ - AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <netdb.h>], + AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <netdb.h> +#include <stdlib.h>], [struct addrinfo hints = {0}, *result; hints.ai_flags = AI_ADDRCONFIG; if (getaddrinfo("localhost", NULL, &hints, &result) != 0) return 1;])], diff --git a/src/ne_auth.c b/src/ne_auth.c index ba6f0ec..2038953 100644 --- a/src/ne_auth.c +++ b/src/ne_auth.c @@ -1508,8 +1508,10 @@ static int ah_post_send(ne_request *req, void *cookie, const ne_status *status) sess->protocol && (sess->protocol->flags & AUTH_FLAG_CONN_AUTH)); } + #ifdef HAVE_SSPI - else if (sess->sspi_context) { + /* Whatever happens: clear the SSPI context if it exists. */ + if (sess->sspi_context) { ne_sspi_clear_context(sess->sspi_context); } #endif |