diff options
| author | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
|---|---|---|
| committer | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
| commit | db637a1d58b61983ca9111b0366252bf35a87904 (patch) | |
| tree | 54f0ba65cd468be89db65953b541c154a7010ebf /neon | |
| parent | d19b4f2d685633d079b566d43a32528b43c4059e (diff) | |
| parent | 35c909bffaf940a27a5ed477cf5fe3d3994b3c90 (diff) | |
rebase to dev300 m69.
Diffstat (limited to 'neon')
| -rw-r--r-- | neon/neon.patch | 17 | ||||
| -rw-r--r-- | neon/neon_exports_unix.patch | 3 |
2 files changed, 11 insertions, 9 deletions
diff --git a/neon/neon.patch b/neon/neon.patch index 573dd5ac5ea7..7b58a09e791a 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- 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 @@ +@@ -1 +1,100 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -501,6 +501,7 @@ +LIBTARGET=NO +USE_DEFFILE=TRUE +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE ++UWINAPILIB= + +# --- Settings ----------------------------------------------------- + @@ -633,8 +634,8 @@ 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 { @@ -642,9 +643,9 @@ 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) { @@ -1630,12 +1631,12 @@ 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) +{ @@ -1688,7 +1689,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) { diff --git a/neon/neon_exports_unix.patch b/neon/neon_exports_unix.patch index 4e8098eb1eeb..1ee17690c8ed 100644 --- a/neon/neon_exports_unix.patch +++ b/neon/neon_exports_unix.patch @@ -1,6 +1,6 @@ --- misc/neon-0.28.2/src/exports.map 2009-09-29 10:28:13.531250000 +0200 +++ misc/build/neon-0.28.2/src/exports.map 2009-09-21 12:16:53.453125000 +0200 -@@ -0,0 +1,286 @@ +@@ -0,0 +1,287 @@ +NEON_0_28_2 { + global: + ne__negotiate_ssl; @@ -284,6 +284,7 @@ + ne_207_set_response_handlers; + ne_accept_207; + ne_simple_request; ++ GetVersionInfo; + local: + *; +}; |