CWS-TOOLING: integrate CWS kso32fixes2

2009-09-14 kso #i104767# - 64 bit build breaker
2009-09-14 kso #i14767# - compiler warning
2009-09-08 kso i104767# - Removed obsolete header.
2009-09-08 kso i104767# - Removed obsolete header include.
2009-09-08 kso #i104767# - Fixed build breaker.
2009-09-07 kso #i104767# - merged in dev300 m57.
2009-09-07 kso #i104767# - support for system credentials usage
2009-09-07 kso #i104767# - support for system credentials usage
2009-09-07 kso #i104767# - support for system credentials usage
2009-09-07 kso #i104767# - support for system credentials usage
2009-09-07 kso #i104767# - support for system credentials usage
2009-09-07 Kai Sommerfeld #i104767# - support for system credentials usage
2009-09-07 Kai Sommerfeld #i104767# - support for system credentials usage
2009-09-07 ks93798 #i104767# - adaptions for NTLM SSO

2 files changed, 80 insertions, 17 deletions

diff --git a/neon/neon.patch b/neon/neon.patch
index b9776097ecbb..569ed0f0a189 100644
--- a/neon/neon.patch
+++ b/neon/neon.patch
@@ -1,5 +1,5 @@
---- misc/neon-0.28.2/src/config.h	2009-06-24 12:49:38.000000000 +0200
-+++ misc/build/neon-0.28.2/src/config.h	2009-06-24 12:46:45.000000000 +0200
+--- misc/neon-0.28.2/src/config.h	2009-08-30 19:00:56.000000000 +0200
++++ misc/build/neon-0.28.2/src/config.h	2009-08-11 09:48:54.000000000 +0200
 @@ -1 +1,484 @@
 -dummy
 +
@@ -486,8 +486,8 @@
 +#else
 +#define HAVE_NTLM 1
 +#endif
---- misc/neon-0.28.2/src/makefile.mk	2009-06-24 12:49:38.000000000 +0200
-+++ misc/build/neon-0.28.2/src/makefile.mk	2009-06-24 12:46:45.000000000 +0200
+--- misc/neon-0.28.2/src/makefile.mk	2009-08-30 19:00:56.000000000 +0200
++++ misc/build/neon-0.28.2/src/makefile.mk	2009-08-11 09:48:54.000000000 +0200
 @@ -1 +1,59 @@
 -dummy
 +PRJ=..$/..$/..$/..$/..
@@ -550,7 +550,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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_auth.c	2009-08-24 15:41:32.000000000 +0200
 @@ -77,6 +77,10 @@
  #include "ne_sspi.h"
  #endif
@@ -585,6 +585,15 @@
  }
  
  /* Returns client nonce string. */
+@@ -351,7 +364,7 @@
+ 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, 
+                               chall->handler->attempt++, sess->username, pwbuf) == 0) {
+         return 0;
+     } else {
 @@ -598,9 +611,10 @@
      int ntlm = ne_strcasecmp(parms->protocol->name, "NTLM") == 0;
      int status;
@@ -704,8 +713,21 @@
  
      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-08-24 15:16:22.000000000 +0200
+@@ -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
+  * function use 'attempt' value as the function return value. */
+-typedef int (*ne_auth_creds)(void *userdata, const char *realm, int attempt,
+-			     char *username, char *password);
++typedef int (*ne_auth_creds)(void *userdata, const char * auth_protocol,
++                 const char *realm, int attempt, char *username, char *password);
+ 
+ /* 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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_defs.h	2009-08-11 09:48:54.000000000 +0200
 @@ -41,7 +41,7 @@
  #endif
  
@@ -716,7 +738,7 @@
  #endif
  
 --- 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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_locks.h	2009-08-11 09:48:54.000000000 +0200
 @@ -22,6 +22,10 @@
  #ifndef NE_LOCKS_H
  #define NE_LOCKS_H
@@ -728,8 +750,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-06-24 12:49:38.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-06-24 12:46:45.000000000 +0200
+--- misc/neon-0.28.2/src/ne_ntlm.c	2009-08-30 19:00:56.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_ntlm.c	2009-08-11 09:48:54.000000000 +0200
 @@ -1 +1,700 @@
 -dummy
 +/* 
@@ -1432,8 +1454,8 @@
 +
 +#endif /* HAVE_OPENSSL */
 +#endif /* HAVE_NTLM */
---- misc/neon-0.28.2/src/ne_ntlm.h	2009-06-24 12:49:38.000000000 +0200
-+++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-06-24 12:46:45.000000000 +0200
+--- misc/neon-0.28.2/src/ne_ntlm.h	2009-08-30 19:00:56.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_ntlm.h	2009-08-11 09:48:54.000000000 +0200
 @@ -1 +1,44 @@
 -dummy
 +/* 
@@ -1481,7 +1503,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-06-24 12:49:13.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_socket.c	2009-08-11 09:48:54.000000000 +0200
 @@ -60,6 +60,7 @@
  #include <stddef.h>
  #ifdef USE_GETADDRINFO
@@ -1491,7 +1513,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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.c	2009-08-11 09:48:54.000000000 +0200
 @@ -202,9 +202,48 @@
          return -1;
      }
@@ -1582,7 +1604,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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_sspi.h	2009-08-11 09:48:54.000000000 +0200
 @@ -41,7 +41,7 @@
  int ne_sspi_clear_context(void *context);
  
@@ -1593,7 +1615,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-06-24 12:46:45.000000000 +0200
++++ misc/build/neon-0.28.2/src/ne_uri.c	2009-08-11 09:48:54.000000000 +0200
 @@ -42,7 +42,7 @@
  #include "ne_alloc.h"
  #include "ne_uri.h"
@@ -1639,3 +1661,44 @@
  /*   3x */ DG, DG, DG, DG, DG, DG, DG, DG, DG, DG, CL, SD, OT, SD, OT, QU,
  /*   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-08-30 18:55:04.000000000 +0200
+@@ -118,6 +118,9 @@
+ #ifdef HAVE_GNUTLS
+     ", GNU TLS " LIBGNUTLS_VERSION
+ #endif /* HAVE_GNUTLS */
++#ifdef HAVE_SSPI
++    ", SSPI"
++#endif /* HAVE_SSPI */
+    "."
+ ;
+ 
+@@ -137,7 +140,7 @@
+     switch (feature) {
+ #if defined(NE_HAVE_SSL) || defined(NE_HAVE_ZLIB) || defined(NE_HAVE_IPV6) \
+     || defined(NE_HAVE_SOCKS) || defined(NE_HAVE_LFS) \
+-    || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N)
++    || defined(NE_HAVE_TS_SSL) || defined(NE_HAVE_I18N) || defined(HAVE_SSPI)
+ #ifdef NE_HAVE_SSL
+     case NE_FEATURE_SSL:
+ #endif
+@@ -159,6 +162,9 @@
+ #ifdef NE_HAVE_I18N
+     case NE_FEATURE_I18N:
+ #endif
++#ifdef HAVE_SSPI
++    case NE_FEATURE_SSPI:
++#endif
+         return 1;
+ #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-08-24 15:47:03.000000000 +0200
+@@ -54,6 +54,7 @@
+ #define NE_FEATURE_SOCKS (5) /* SOCKSv5 support */
+ #define NE_FEATURE_TS_SSL (6) /* Thread-safe SSL/TLS support */
+ #define NE_FEATURE_I18N (7) /* i18n error message support */
++#define NE_FEATURE_SSPI (8) /* NTLM/Negotiate authentication protocol via SSPI */
+ 
+ /* Returns non-zero if library is built with support for the given
+  * NE_FEATURE_* feature code 'code'. */
diff --git a/neon/version.mk b/neon/version.mk
index 4c044d2c2fe8..c5c6d6cc47f5 100644
--- a/neon/version.mk
+++ b/neon/version.mk
@@ -32,9 +32,9 @@
 # the major
 NEON_MAJOR=0
 # the minor
-NEON_MINOR=26
+NEON_MINOR=28
 # the micro
-NEON_MICRO=3
+NEON_MICRO=2
 
 # concat
 NEON_VERSION=$(NEON_MAJOR)$(NEON_MINOR)$(NEON_MICRO)