Backport r393364 from trunk, fixing a bug with crypt in htdbm.

Reviewed By: trawick, colm, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396045 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index c53d29e282687694336fdbd39d3d5329bc93f873..39ca737a0f09fb5de3b588acb98fb0ad43b93599 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,9 @@ Changes with Apache 2.2.2
      send to a target site.  Reported by Thiago Zaninotti
      <thiango nstalker.com>. [Mark Cox]
 
+  *) 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 13e10c6b18e13ebd47d1a269e84f662c031a6b8f..535b0443fcfc4f1fbbbe5a5bee3d7c14c3827dc3 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