diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 13:46:56 +0100 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 13:46:56 +0100 |
commit | d19b4f2d685633d079b566d43a32528b43c4059e (patch) | |
tree | 9ab390f7da1e53ccbdd83701c4ed012d42c75369 /neon | |
parent | merged with DEV300_m67 (diff) | |
download | core-d19b4f2d685633d079b566d43a32528b43c4059e.tar.gz core-d19b4f2d685633d079b566d43a32528b43c4059e.zip |
resync with DEV300_m67
Diffstat (limited to 'neon')
-rw-r--r-- | neon/neon.patch | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/neon/neon.patch b/neon/neon.patch index 8257b64a7758..573dd5ac5ea7 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -1,5 +1,5 @@ ---- misc/neon-0.28.2/src/config.h 2009-11-26 23:47:06.000000000 +0100 -+++ misc/build/neon-0.28.2/src/config.h 2009-11-26 23:46:21.000000000 +0100 +--- misc/neon-0.28.2/src/config.h 2009-12-10 13:29:15.000000000 +0100 ++++ misc/build/neon-0.28.2/src/config.h 2009-12-10 13:21:58.000000000 +0100 @@ -1 +1,488 @@ -dummy + @@ -490,9 +490,9 @@ +#else +#define HAVE_NTLM 1 +#endif ---- misc/neon-0.28.2/src/makefile.mk 2009-11-26 23:47:06.000000000 +0100 -+++ misc/build/neon-0.28.2/src/makefile.mk 2009-11-26 23:44:12.000000000 +0100 -@@ -1 +1,60 @@ +--- misc/neon-0.28.2/src/makefile.mk 2009-12-10 13:29:15.000000000 +0100 ++++ misc/build/neon-0.28.2/src/makefile.mk 2009-12-10 13:21:58.000000000 +0100 +@@ -1 +1,99 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -594,7 +594,7 @@ +DEF1NAME=$(SHL1TARGET) +.INCLUDE : target.mk --- misc/neon-0.28.2/src/ne_auth.c 2008-02-29 17:30:12.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_auth.c 2009-12-10 13:21:58.000000000 +0100 @@ -77,6 +77,10 @@ #include "ne_sspi.h" #endif @@ -633,24 +633,21 @@ static int get_credentials(auth_session *sess, ne_buffer **errmsg, int attempt, struct auth_challenge *chall, char *pwbuf) { -- if (chall->handler->creds(chall->handler->userdata, sess->realm, -+ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, +- if (chall->handler->creds(chall->handler->userdata, sess->realm, ++ if (chall->handler->creds(chall->handler->userdata, chall->protocol->name, sess->realm, chall->handler->attempt++, sess->username, pwbuf) == 0) { return 0; } else { -@@ -598,9 +611,10 @@ +@@ -598,7 +611,8 @@ int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0; int status; char *response = NULL; -- +- + char password[NE_ABUFSIZ]; -+ ++ NE_DEBUG(NE_DBG_HTTPAUTH, "auth: SSPI challenge.\n"); -- -+ + if (!sess->sspi_context) { - ne_uri uri = {0}; - @@ -614,8 +628,17 @@ return status; } @@ -758,7 +755,7 @@ return ret; } --- misc/neon-0.28.2/src/ne_auth.h 2007-12-05 17:39:58.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_auth.h 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_auth.h 2009-12-10 13:21:58.000000000 +0100 @@ -47,8 +47,8 @@ * Hint: if you just wish to attempt authentication just once (even if * the user gets the username/password wrong), have the callback @@ -771,7 +768,7 @@ /* Set callbacks to provide credentials for server and proxy * authentication, using the default set of authentication protocols. --- misc/neon-0.28.2/src/ne_defs.h 2006-10-24 21:40:09.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_defs.h 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_defs.h 2009-12-10 13:21:58.000000000 +0100 @@ -41,7 +41,7 @@ #endif @@ -782,7 +779,7 @@ #endif --- misc/neon-0.28.2/src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_locks.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_locks.c 2009-12-10 13:21:58.000000000 +0100 @@ -579,6 +579,23 @@ const char *token = ne_get_response_header(ctx->req, "Lock-Token"); /* at the root element; retrieve the Lock-Token header, @@ -850,7 +847,7 @@ } } --- misc/neon-0.28.2/src/ne_locks.h 2006-01-02 12:43:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_locks.h 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_locks.h 2009-12-10 13:21:58.000000000 +0100 @@ -22,6 +22,10 @@ #ifndef NE_LOCKS_H #define NE_LOCKS_H @@ -862,8 +859,8 @@ #include "ne_request.h" /* for ne_session + ne_request */ #include "ne_uri.h" /* for ne_uri */ ---- misc/neon-0.28.2/src/ne_ntlm.c 2009-11-26 23:47:06.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-11-26 23:41:57.000000000 +0100 +--- misc/neon-0.28.2/src/ne_ntlm.c 2009-12-10 13:29:15.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_ntlm.c 2009-12-10 13:21:58.000000000 +0100 @@ -1 +1,703 @@ -dummy +/* @@ -1569,8 +1566,8 @@ + +#endif /* HAVE_OPENSSL */ +#endif /* HAVE_NTLM */ ---- misc/neon-0.28.2/src/ne_ntlm.h 2009-11-26 23:47:06.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-11-26 23:41:57.000000000 +0100 +--- misc/neon-0.28.2/src/ne_ntlm.h 2009-12-10 13:29:15.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_ntlm.h 2009-12-10 13:21:58.000000000 +0100 @@ -1 +1,44 @@ -dummy +/* @@ -1618,7 +1615,7 @@ + +#endif /* NE_NTLM_H */ --- misc/neon-0.28.2/src/ne_socket.c 2008-02-28 14:19:19.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_socket.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_socket.c 2009-12-10 13:21:58.000000000 +0100 @@ -60,6 +60,7 @@ #include <stddef.h> #ifdef USE_GETADDRINFO @@ -1628,17 +1625,17 @@ #endif --- misc/neon-0.28.2/src/ne_sspi.c 2007-08-10 17:26:08.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_sspi.c 2009-12-10 13:28:42.000000000 +0100 @@ -202,9 +202,48 @@ return -1; } -+ return 0; ++ return 0; +} + +/* + * Simplification wrapper arround AcquireCredentialsHandle as most of -+ * the parameters do not change. ++ * the parameters do not change. + */ +static int acquireCredentialsHandleForUsername(CredHandle * credentials, char *package, const char *username, const char *password) +{ @@ -1691,7 +1688,7 @@ /* Reset any existing context since we are starting over */ resetContext(sspiContext); -+ ++ + if (strlen(username) != 0) { + if (acquireCredentialsHandleForUsername + (&sspiContext->credentials, sspiContext->mechanism, username, password) != SEC_E_OK) { @@ -1719,7 +1716,7 @@ securityStatus = initializeSecurityContext(&sspiContext->credentials, NULL, --- misc/neon-0.28.2/src/ne_sspi.h 2006-02-12 13:05:14.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_sspi.h 2009-12-10 13:21:58.000000000 +0100 @@ -41,7 +41,7 @@ int ne_sspi_clear_context(void *context); @@ -1730,7 +1727,7 @@ #endif /* HAVE_SSPI */ --- misc/neon-0.28.2/src/ne_uri.c 2007-12-05 12:04:47.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_uri.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_uri.c 2009-12-10 13:21:58.000000000 +0100 @@ -42,7 +42,7 @@ #include "ne_alloc.h" #include "ne_uri.h" @@ -1777,7 +1774,7 @@ /* 4x */ AT, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, /* 5x */ AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, AL, GD, OT, GD, OT, US, --- misc/neon-0.28.2/src/ne_utils.c 2006-03-07 10:36:43.000000000 +0100 -+++ misc/build/neon-0.28.2/src/ne_utils.c 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_utils.c 2009-12-10 13:21:58.000000000 +0100 @@ -118,6 +118,9 @@ #ifdef HAVE_GNUTLS ", GNU TLS " LIBGNUTLS_VERSION @@ -1808,7 +1805,7 @@ #endif /* NE_HAVE_* */ default: --- misc/neon-0.28.2/src/ne_utils.h 2007-07-16 08:54:57.000000000 +0200 -+++ misc/build/neon-0.28.2/src/ne_utils.h 2009-11-26 23:41:57.000000000 +0100 ++++ misc/build/neon-0.28.2/src/ne_utils.h 2009-12-10 13:21:58.000000000 +0100 @@ -54,6 +54,7 @@ #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */ |