Import of code from heimdal

This commit updates the code imported from heimdal to
8ce821c38744b30e226ff024f675668b991b984d (switch-from-svn-to-git-1998-g8ce821c)

Upstream changes are:

Asanka C. Herath (2):
      Revert use of backslash as an escape for double quote in config strings
      Condition roken's ssize_t definition for compatibility

Love Hornquist Astrand (1):
      don't undefined SLIST

Change-Id: I8855e060e88008f95eb2b24b029843081702fc04
Reviewed-on: http://gerrit.openafs.org/3761
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/external/heimdal-last b/src/external/heimdal-last
index c1a7d22fe94415c6edfe2e88f5a7e172bd04e895..b293332bed2dbc95122092dfb8ebabbc54b45f8f 100644 (file)
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-42f9c644cf00be752f09d85a9664bf2e3502101c
+8ce821c38744b30e226ff024f675668b991b984d

diff --git a/src/external/heimdal/krb5/config_file.c b/src/external/heimdal/krb5/config_file.c
index 13d07614b797d089de7a3b1beb48b83af8448ae0..81f9c44e02c33c230c92cfa14fed44b7754ee80e 100644 (file)
--- a/src/external/heimdal/krb5/config_file.c
+++ b/src/external/heimdal/krb5/config_file.c
@@ -877,12 +877,7 @@ next_component_string(char * begin, char * delims, char **state)
 
     end = begin;
     while (*end == '"') {
-        char * t;
-        while ((t = strchr(end + 1, '"')) != NULL && *(t - 1) == '\\') {
-            --t;
-            memmove(t, t + 1, strlen(t));
-            end = t;
-        }
+        char * t = strchr(end + 1, '"');
 
         if (t)
             end = ++t;

diff --git a/src/external/heimdal/roken/roken-common.h b/src/external/heimdal/roken/roken-common.h
index d9369a3e15761ce7b5a2e9aebebeb2cbff832720..a819d510d031de64971ab947f676af7b1a66795a 100644 (file)
--- a/src/external/heimdal/roken/roken-common.h
+++ b/src/external/heimdal/roken/roken-common.h
@@ -150,11 +150,6 @@
 
 #endif /* !_WIN32 */
 
-/* Minimize conflict with WinNT.h */
-#ifdef SLIST_ENTRY
-#undef SLIST_ENTRY
-#endif
-
 #ifndef PATH_MAX
 #define PATH_MAX MAX_PATH
 #endif

diff --git a/src/external/heimdal/roken/roken.h.in b/src/external/heimdal/roken/roken.h.in
index 6ecdf1c8def313058e88cf4f1543615918967d7a..7bc23de06ea13566e42f9c4eb1d30eb484120d46 100644 (file)
--- a/src/external/heimdal/roken/roken.h.in
+++ b/src/external/heimdal/roken/roken.h.in
@@ -262,12 +262,18 @@ struct sockaddr_dl;
 #endif
 
 #ifndef HAVE_SSIZE_T
+#ifndef SSIZE_T_DEFINED
+#ifdef ssize_t
+#undef ssize_t
+#endif
 #ifdef _WIN64
 typedef __int64 ssize_t;
 #else
 typedef int ssize_t;
 #endif
-#endif
+#define SSIZE_T_DEFINED
+#endif  /* SSIZE_T_DEFINED */
+#endif  /* HAVE_SSIZE_T */
 
 #include <roken-common.h>