svn commit: r393883 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS support/htdbm.c

[tr...@apache.org]

Author: trawick
Date: Thu Apr 13 11:52:02 2006
New Revision: 393883

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

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

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=393883&r1=393882&r2=393883&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Apr 13 11:52:02 2006
@@ -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]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=393883&r1=393882&r2=393883&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr 13 11:52:02 2006
@@ -74,14 +74,6 @@
 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

Modified: httpd/httpd/branches/2.2.x/support/htdbm.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/support/htdbm.c?rev=393883&r1=393882&r2=393883&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/support/htdbm.c (original)
+++ httpd/httpd/branches/2.2.x/support/htdbm.c Thu Apr 13 11:52:02 2006
@@ -308,6 +308,10 @@
         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: