The crypt() prototype is in <unistd.h> instead of <crypt.h>

on HP-UX.  We had no prototype for crypt() there.
In 64-bit mode, a crash occurred because the pointer
returned by crypt() was truncated before we passed
the pointer to apr_cpystrn().

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393364 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c360bbc4a4eda113757cdaf5b5a30151ecc7f86a..700544e942768b98083bc21febbd11addc97797c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) htdbm: Fix crash processing -d option in 64-bit mode on HP-UX.
+     [Jeff Trawick]
+
   *) htdbm: Warn the user when adding a plaintext password on a platform
      where it wouldn't work with the server (i.e., anywhere that has
      crypt()).  [Jeff Trawick]

diff --git a/support/htdbm.c b/support/htdbm.c
index 2c71834eb1910a1d69dbd050b581bca2cc284a5e..84ab8f07e9af765dfe151ed124efc4a5704264cf 100644 (file)
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -48,6 +48,9 @@
 #include "apr_xlate.h"
 #endif /*APR_CHARSET_EBCDIC*/
 
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #if APR_HAVE_CRYPT_H
 #include <crypt.h>
 #endif