Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r534066 - in /httpd/httpd/branches/2.2.x: CHANGES
 support/htdbm.c
Date: Tue, 01 May 2007 13:21:01 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20070501132101.5E4E91A983E@eris.apache.org>

Author: jim
Date: Tue May  1 06:20:59 2007
New Revision: 534066

URL: http://svn.apache.org/viewvc?view=rev&rev=534066
Log:
Approved backport

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/support/htdbm.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=534066&r1=534065&r2=534066
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue May  1 06:20:59 2007
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
+  *) htdbm: Enable crypt support on platforms with crypt() but not
+     <crypt.h>, such as z/OS. [David Jones <oscaremma gmail.com>]
+
   *) mod_ssl: Move thread locking upcall initialization before
      hardware library initialization, so hardware library can use
      these upcalls when run in a threaded MPM. PR 20951.

Modified: httpd/httpd/branches/2.2.x/support/htdbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/support/htdbm.c?view=diff&rev=534066&r1=534065&r2=534066
==============================================================================
--- httpd/httpd/branches/2.2.x/support/htdbm.c (original)
+++ httpd/httpd/branches/2.2.x/support/htdbm.c Tue May  1 06:20:59 2007
@@ -69,7 +69,7 @@
 #define ALG_APMD5 1
 #define ALG_APSHA 2
 
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
 #define ALG_CRYPT 3
 #endif
 
@@ -311,12 +311,12 @@
         case ALG_PLAIN:
             /* XXX this len limitation is not in sync with any HTTPd len. */
             apr_cpystrn(cpw,htdbm->userpass,sizeof(cpw));
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
             fprintf(stderr, "Warning: Plain text passwords aren't supported by the "
                     "server on this platform!\n");
 #endif
         break;
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
         case ALG_CRYPT:
             (void) srand((int) time((time_t *) NULL));
             to64(&salt[0], rand(), 8);
@@ -347,7 +347,7 @@
 static void htdbm_usage(void)
 {
 
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
 #define CRYPT_OPTION "d"
 #else
 #define CRYPT_OPTION ""
@@ -367,7 +367,7 @@
     fprintf(stderr, "   -c   Create a new database.\n");
     fprintf(stderr, "   -n   Don't update database; display results on stdout.\n");
     fprintf(stderr, "   -m   Force MD5 encryption of the password (default).\n");
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
     fprintf(stderr, "   -d   Force CRYPT encryption of the password (now deprecated).\n");
 #endif
     fprintf(stderr, "   -p   Do not encrypt the password (plaintext).\n");
@@ -474,7 +474,7 @@
             case 's':
                 h->alg = ALG_APSHA;
                 break;
-#if APR_HAVE_CRYPT_H
+#if (!(defined(WIN32) || defined(TPF) || defined(NETWARE)))
             case 'd':
                 h->alg = ALG_CRYPT;
                 break;