You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2008/09/16 15:50:43 UTC

svn commit: r695883 - in /httpd/httpd/trunk/docs/manual/mod: mod_ldap.html.en mod_ldap.xml

Author: covener
Date: Tue Sep 16 06:50:43 2008
New Revision: 695883

URL: http://svn.apache.org/viewvc?rev=695883&view=rev
Log:
despite this being mod_ldap and not mod_authnz_ldap, make the examples 
a little more complete/self-contained.

Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en?rev=695883&r1=695882&r2=695883&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.html.en Tue Sep 16 06:50:43 2008
@@ -104,6 +104,10 @@
         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 @@
         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 @@
         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 @@
                 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 @@
                 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>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml?rev=695883&r1=695882&r2=695883&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml Tue Sep 16 06:50:43 2008
@@ -79,6 +79,10 @@
         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 @@
         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 @@
         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 @@
                 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 @@
                 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>