Point out that the format of encrypted passwords depends on

whether you're using mod_authn_basic or mod_authn_digest.
Reported by Josef Spillner, PR46672.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029180 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_authn_dbd.xml b/docs/manual/mod/mod_authn_dbd.xml
index d0a5545ed75979513dc292df168c584bcc2ea845..3e984e12f27149efe221ac541b7a1b1112def8d9 100644 (file)
--- a/docs/manual/mod/mod_authn_dbd.xml
+++ b/docs/manual/mod/mod_authn_dbd.xml
@@ -56,6 +56,7 @@
 </seealso>
 <seealso><directive module="mod_dbd">DBDriver</directive></seealso>
 <seealso><directive module="mod_dbd">DBDParams</directive></seealso>
+<seealso><a href="../misc/password_encryptions.html">Password Formats</a></seealso>
 
 <section id="socache">
 <title>Performance and Cacheing</title>
@@ -148,6 +149,11 @@ AuthDBDUserPWQuery \
     the query statement will be stored as environment variables with
     names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
+    <p>The encrypted password format depends on which authentication
+    frontend (e.g. <module>mod_authn_basic</module> or
+    <module>mod_authn_digest</module>) is being used.  See <a
+    href="../misc/password_encryptions.html">Password Formats</a> for
+    more information.</p>
 </usage>
 </directivesynopsis>
 
@@ -178,6 +184,11 @@ AuthDBDUserRealmQuery \
     the query statement will be stored as environment variables with
     names of the form <code>AUTHENTICATE_<var>COLUMN</var></code>.
     </p>
+    <p>The encrypted password format depends on which authentication
+    frontend (e.g. <module>mod_authn_basic</module> or
+    <module>mod_authn_digest</module>) is being used.  See <a
+    href="../misc/password_encryptions.html">Password Formats</a> for
+    more information.</p>
 </usage>
 </directivesynopsis>
 

diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml
index 8251b51f0b30c3aada45c6b51654ab6584e27eca..37989c3be0c229046df2d036610d6642a0bfd7c0 100644 (file)
--- a/docs/manual/mod/mod_authn_dbm.xml
+++ b/docs/manual/mod/mod_authn_dbm.xml
@@ -51,6 +51,7 @@
 <seealso>
   <directive module="mod_auth_digest">AuthDigestProvider</directive>
 </seealso>
+<seealso><a href="../misc/password_encryptions.html">Password Formats</a></seealso>
 
 <directivesynopsis>
 <name>AuthDBMUserFile</name>
@@ -79,6 +80,12 @@ passwords for authentication</description>
       download the <directive>AuthDBMUserFile</directive>.</p>
     </note>
 
+    <p>The encrypted password format depends on which authentication
+    frontend (e.g. <module>mod_authn_basic</module> or
+    <module>mod_authn_digest</module>) is being used.  See <a
+    href="../misc/password_encryptions.html">Password Formats</a> for
+    more information.</p>
+
     <p>Important compatibility note: The implementation of
     <code>dbmopen</code> in the apache modules reads the string length of
     the hashed values from the DBM data structures, rather than relying

diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml
index d95bd7635f548c85f96909ed5e340f500dc03400..f6e228b9f1348a904362f565b79587cc40bd579f 100644 (file)
--- a/docs/manual/mod/mod_authn_file.xml
+++ b/docs/manual/mod/mod_authn_file.xml
@@ -49,6 +49,7 @@
 </seealso>
 <seealso><program>htpasswd</program></seealso>
 <seealso><program>htdigest</program></seealso>
+<seealso><a href="../misc/password_encryptions.html">Password Formats</a></seealso>
  
 <directivesynopsis>
 <name>AuthUserFile</name>
@@ -71,10 +72,15 @@ passwords for authentication</description>
     ID is defined multiple times, <module>mod_authn_file</module> will
     use the first occurrence to verify the password.</p>
 
-    <p>The utility <program>htpasswd</program>
+    <p>The encrypted password format depends on which authentication
+    frontend (e.g. <module>mod_authn_basic</module> or
+    <module>mod_authn_digest</module>) is being used.  See <a
+    href="../misc/password_encryptions.html">Password Formats</a> for
+    more information.</p>
+
+    <p>For <module>mod_authn_basic</module>, use the utility <program>htpasswd</program>
     which is installed as part of the binary distribution, or which
-    can be found in <code>src/support</code>, is used to maintain
-    the password file for <em>HTTP Basic Authentication</em>. See the
+    can be found in <code>src/support</code>. See the
     <a href="../programs/htpasswd.html">man page</a> for more details.
     In short:</p>
 
@@ -98,9 +104,7 @@ passwords for authentication</description>
     module="mod_authn_dbm">AuthDBMUserFile</directive> should be used
     instead.</p>
 
-    <p>If you are using <em>HTTP Digest Authentication</em>, the <program>
-    htpasswd</program> tool is not sufficient.
-    You have to use <program>htdigest</program>
+    <p>For <module>mod_authn_digest</module>, use <program>htdigest</program>
     instead. Note that you cannot mix user data for Digest Authentication
     and Basic Authentication within the same file.</p>