despite this being mod_ldap and not mod_authnz_ldap, make the examples

a little more complete/self-contained.

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

diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index bc8515a4cb8f84d815af991aae12ffdb29bc3c95..05a31e8861eb9d07dc6cb860124383984e327bc6 100644 (file)
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -104,6 +104,10 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one<br />
         Require valid-user<br />
       </span>
@@ -243,6 +247,10 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
         Require valid-user<br />
       </span>
@@ -262,6 +270,10 @@ by other LDAP modules</td></tr>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS<br />
         Require valid-user<br />
       </span>
@@ -312,6 +324,10 @@ by other LDAP modules</td></tr>
                 Order deny,allow<br />
                 Deny from all<br />
                 Allow from yourdomain.example.com<br />
+                Satisfy any<br />
+                AuthType Basic<br />
+                AuthName "LDAP Protected"<br />
+                AuthBasicProvider ldap<br />
                 LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
                 Require valid-user<br />
@@ -379,6 +395,10 @@ by other LDAP modules</td></tr>
                 Allow from yourdomain.example.com<br />
                 LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
                 LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
+                Satisfy any<br />
+                AuthType Basic<br />
+                AuthName "LDAP Protected"<br />
+                AuthBasicProvider ldap<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
                 Require valid-user<br />
             </span>

diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index e88c34a56352e2271ca34faa743f0a1cf6c8c27d..ea184b427d797589de3ae9b01337d7517f8e9569 100644 (file)
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -79,6 +79,10 @@ by other LDAP modules</description>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one<br />
         Require valid-user<br />
       </indent>
@@ -220,6 +224,10 @@ by other LDAP modules</description>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
         Require valid-user<br />
       </indent>
@@ -239,6 +247,10 @@ by other LDAP modules</description>
         Order deny,allow<br />
         Deny from all<br />
         Allow from yourdomain.example.com<br />
+        Satisfy any<br />
+        AuthType Basic<br />
+        AuthName "LDAP Protected"<br />
+        AuthBasicProvider ldap<br />
         AuthLDAPURL ldap://127.0.0.1/dc=example,dc=com?uid?one TLS<br />
         Require valid-user<br />
       </indent>
@@ -289,6 +301,10 @@ by other LDAP modules</description>
                 Order deny,allow<br />
                 Deny from all<br />
                 Allow from yourdomain.example.com<br />
+                Satisfy any<br />
+                AuthType Basic<br />
+                AuthName "LDAP Protected"<br />
+                AuthBasicProvider ldap<br />
                 LDAPTrustedClientCert CERT_NICKNAME &lt;nickname&gt; [password]<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
                 Require valid-user<br />
@@ -356,6 +372,10 @@ by other LDAP modules</description>
                 Allow from yourdomain.example.com<br />
                 LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem<br />
                 LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem<br />
+                Satisfy any<br />
+                AuthType Basic<br />
+                AuthName "LDAP Protected"<br />
+                AuthBasicProvider ldap<br />
                 AuthLDAPURL ldaps://127.0.0.1/dc=example,dc=com?uid?one<br />
                 Require valid-user<br />
             </indent>