#106830# - NTLM: do not call auth callback, if session timed out.

1 files changed, 24 insertions, 21 deletions

diff --git a/neon/neon.patch b/neon/neon.patch
index 8817f54a3381..f6725d71edb4 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.28.2/src/config.h	2009-11-12 13:03:04.000000000 +0100
-+++ misc/build/neon-0.28.2/src/config.h	2009-11-12 12:53:41.000000000 +0100
+--- misc/neon-0.28.2/src/config.h	2009-11-19 21:17:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/config.h	2009-11-18 09:06:10.000000000 +0100
 @@ -1 +1,488 @@
 -dummy
 +
@@ -490,8 +490,8 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.28.2/src/makefile.mk	2009-11-12 13:03:04.000000000 +0100
-+++ misc/build/neon-0.28.2/src/makefile.mk	2009-11-12 11:39:52.000000000 +0100
+--- misc/neon-0.28.2/src/makefile.mk	2009-11-19 21:17:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/makefile.mk	2009-11-18 09:06:10.000000000 +0100
 @@ -1 +1,59 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
@@ -554,7 +554,7 @@
 +
 +.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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_auth.c	2009-11-19 21:12:52.000000000 +0100
 @@ -77,6 +77,10 @@
  #include "ne_sspi.h"
  #endif
@@ -656,7 +656,7 @@
 +    
 +    NE_DEBUG(NE_DBG_HTTPAUTH, "auth: NTLM challenge.\n");
 +    
-+    if (!parms->opaque) {
++    if (!parms->opaque && (!sess->ntlm_context || (attempt > 1))) {
 +        char password[NE_ABUFSIZ];
 +
 +        if (get_credentials(sess, errmsg, attempt, parms, password)) {
@@ -718,7 +718,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_auth.h	2009-11-18 09:06:10.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
@@ -731,7 +731,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_defs.h	2009-11-18 09:06:10.000000000 +0100
 @@ -41,7 +41,7 @@
  #endif
  
@@ -742,7 +742,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-12 12:57:15.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_locks.c	2009-11-18 09:06:10.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,
@@ -810,7 +810,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_locks.h	2009-11-18 09:06:10.000000000 +0100
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -822,9 +822,9 @@
  #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-12 13:03:04.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-11-12 11:39:52.000000000 +0100
-@@ -1 +1,700 @@
+--- misc/neon-0.28.2/src/ne_ntlm.c	2009-11-19 21:17:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-11-19 21:15:00.000000000 +0100
+@@ -1 +1,703 @@
 -dummy
 +/* 
 +   Handling of NTLM Authentication
@@ -1497,6 +1497,9 @@
 +    if (context == NULL) {
 +	return -1;
 +    } else {
++        if (!responseToken && (context->state == NTLMSTATE_TYPE3))
++          context->state = NTLMSTATE_NONE;
++
 +        if (context->state <= NTLMSTATE_TYPE3) {
 +	  ntlm ntlmstatus = ne_input_ntlm(context, responseToken);
 +
@@ -1526,8 +1529,8 @@
 +
 +#endif /* HAVE_OPENSSL */
 +#endif /* HAVE_NTLM */
---- misc/neon-0.28.2/src/ne_ntlm.h	2009-11-12 13:03:04.000000000 +0100
-+++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-11-12 11:39:51.000000000 +0100
+--- misc/neon-0.28.2/src/ne_ntlm.h	2009-11-19 21:17:19.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-11-18 09:06:10.000000000 +0100
 @@ -1 +1,44 @@
 -dummy
 +/* 
@@ -1575,7 +1578,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_socket.c	2009-11-18 09:06:10.000000000 +0100
 @@ -60,6 +60,7 @@
  #include <stddef.h>
  #ifdef USE_GETADDRINFO
@@ -1585,7 +1588,7 @@
  #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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-11-18 09:06:10.000000000 +0100
 @@ -202,9 +202,48 @@
          return -1;
      }
@@ -1676,7 +1679,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-12 11:39:51.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_sspi.h	2009-11-18 09:06:10.000000000 +0100
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -1687,7 +1690,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_uri.c	2009-11-18 09:06:10.000000000 +0100
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -1734,7 +1737,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-12 11:39:52.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_utils.c	2009-11-18 09:06:10.000000000 +0100
 @@ -118,6 +118,9 @@
  #ifdef HAVE_GNUTLS
      ", GNU TLS " LIBGNUTLS_VERSION
@@ -1765,7 +1768,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-12 11:39:51.000000000 +0100
++++ misc/build/neon-0.28.2/src/ne_utils.h	2009-11-18 09:06:10.000000000 +0100
 @@ -54,6 +54,7 @@
  #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
  #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */