svn commit: r393364 - in /httpd/httpd/trunk: CHANGES support/htdbm.c

[tr...@apache.org]

Author: trawick
Date: Tue Apr 11 18:55:11 2006
New Revision: 393364

URL: http://svn.apache.org/viewcvs?rev=393364&view=rev
Log:
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().

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/support/htdbm.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=393364&r1=393363&r2=393364&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Apr 11 18:55:11 2006
@@ -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]

Modified: httpd/httpd/trunk/support/htdbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/support/htdbm.c?rev=393364&r1=393363&r2=393364&view=diff
==============================================================================
--- httpd/httpd/trunk/support/htdbm.c (original)
+++ httpd/httpd/trunk/support/htdbm.c Tue Apr 11 18:55:11 2006
@@ -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