Import of code from heimdal

This commit updates the code imported from heimdal to
dc87425f93bdd3d9c88be1a380ed5372980235bf (git2svn-syncpoint-master-290-gdc87425)

Upstream changes are:

Ben Kaduk (1):
      Always provide a usable PATH_MAX

Jeffrey Hutzelman (1):
      hcrypto/rand-unix.c: Ignore write(2) result harder

Nicolas Williams (1):
      Winsock connect returns WSAEWOULDBLOCK...

Change-Id: I10a001a3a606c799f7b9ab7db42ecef4ad5a5c21
Reviewed-on: http://gerrit.openafs.org/9992
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/src/external/heimdal-last b/src/external/heimdal-last
index 5a8fadd2b303ca63af2ba6e4009fe40b1699c722..e14bb348913ce45473fae4602c9918a0f23bea0b 100644 (file)
--- a/src/external/heimdal-last
+++ b/src/external/heimdal-last
@@ -1 +1 @@
-66f4c441e9e0de68fbcf81763642779ac5c33631
+dc87425f93bdd3d9c88be1a380ed5372980235bf

diff --git a/src/external/heimdal/hcrypto/rand-unix.c b/src/external/heimdal/hcrypto/rand-unix.c
index c52155baaa8120d7424e8ef4e15d61900bd3d9b4..b67cd6321655f3905e573ce3ef62214cec7fb62e 100644 (file)
--- a/src/external/heimdal/hcrypto/rand-unix.c
+++ b/src/external/heimdal/hcrypto/rand-unix.c
@@ -82,7 +82,8 @@ unix_seed(const void *indata, int size)
     if (fd < 0)
        return;
 
-    write(fd, indata, size);
+    if (write(fd, indata, size) != size)
+        ; /* don't care */
     close(fd);
 
 }

diff --git a/src/external/heimdal/roken/roken-common.h b/src/external/heimdal/roken/roken-common.h
index 02122be4968dd5284e7144a551f9e43fa8dba51f..06106d0d5d8bbba41196592ca512fd69381e2248 100644 (file)
--- a/src/external/heimdal/roken/roken-common.h
+++ b/src/external/heimdal/roken/roken-common.h
@@ -151,7 +151,11 @@
 #endif /* !_WIN32 */
 
 #ifndef PATH_MAX
+#ifdef MAX_PATH
 #define PATH_MAX MAX_PATH
+#else
+#define PATH_MAX 4096
+#endif
 #endif
 
 #ifndef RETSIGTYPE

diff --git a/src/external/heimdal/roken/roken.h.in b/src/external/heimdal/roken/roken.h.in
index 82c973b776fb61b8c55cf52e1bd067b4a2d5a1d7..52a786c757a435fe5d8ff8d0197ffb22ac8784bc 100644 (file)
--- a/src/external/heimdal/roken/roken.h.in
+++ b/src/external/heimdal/roken/roken.h.in
@@ -1175,6 +1175,9 @@ int ROKEN_LIB_FUNCTION rk_socket(int, int, int);
 #ifndef EAFNOSUPPORT
 #define EAFNOSUPPORT            102
 #endif
+#ifndef EINPROGRESS
+#define EINPROGRESS             112
+#endif
 #ifndef ENOTSOCK
 #define ENOTSOCK               128
 #endif