From: Jeff Trawick <trawick@apache.org>
Date: Thu, 13 Apr 2006 18:52:02 +0000 (+0000)
Subject: Backport change to htdbm to warning when trying to use
X-Git-Tag: 2.2.2~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ab627158608482c3080750f929a9845e1aec85;p=thirdparty%2Fapache%2Fhttpd.git

Backport change to htdbm to warning when trying to use
plaintext passwords on a platform where the server doesn't
support them.

Reviewed by: rpluem, colm


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

diff --git a/CHANGES b/CHANGES
index 223149ecdb8..231b312070e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.2
 
+  *) 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]
+
   *) mod_proxy: don't reuse a connection that may be to the wrong backend
      PR 39253 [Ruediger Pluem]
 
diff --git a/STATUS b/STATUS
index 7f5c45c9517..e15b8ecd095 100644
--- a/STATUS
+++ b/STATUS
@@ -74,14 +74,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * htdbm: Warn when the user adds a plaintext password on a platform
-      with crypt().  The server will assume that the format is crypt().
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=392944&view=rev
-        2.2.x version of patch:
-          Trunk version works
-      +1: trawick, rpluem, colm
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init
diff --git a/support/htdbm.c b/support/htdbm.c
index 5ad14c088b2..2c71834eb19 100644
--- a/support/htdbm.c
+++ b/support/htdbm.c
@@ -308,6 +308,10 @@ static apr_status_t htdbm_make(htdbm_t *htdbm)
         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
+            fprintf(stderr, "Warning: Plain text passwords aren't supported by the "
+                    "server on this platform!\n");
+#endif
         break;
 #if APR_HAVE_CRYPT_H
         case ALG_CRYPT: