You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/05/21 20:44:29 UTC
cvs commit: httpd-2.0/docs/manual/mod mod_auth_ldap.html.en mod_auth_ldap.xml mod_file_cache.html.en mod_file_cache.xml.ko
nd 2004/05/21 11:44:29
Modified: docs/manual/mod Tag: APACHE_2_0_BRANCH mod_auth_ldap.html.en
mod_auth_ldap.xml mod_file_cache.html.en
mod_file_cache.xml.ko
Log:
update transformation
Revision Changes Path
No revision
No revision
1.12.2.10 +14 -11 httpd-2.0/docs/manual/mod/mod_auth_ldap.html.en
Index: mod_auth_ldap.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_auth_ldap.html.en,v
retrieving revision 1.12.2.9
retrieving revision 1.12.2.10
diff -u -u -r1.12.2.9 -r1.12.2.10
--- mod_auth_ldap.html.en 3 Apr 2004 16:30:45 -0000 1.12.2.9
+++ mod_auth_ldap.html.en 21 May 2004 18:44:28 -0000 1.12.2.10
@@ -315,7 +315,8 @@
<p>This directive specifies an LDAP group whose members are
allowed access. It takes the distinguished name of the LDAP
- group. For example, assume that the following entry existed in
+ group. Note: Do not surround the group name with quotes.
+ For example, assume that the following entry existed in
the LDAP directory:</p>
<div class="example"><p><code>
dn: cn=Administrators, o=Airius<br />
@@ -326,7 +327,7 @@
<p>The following directive would grant access to both Fred and
Barbara:</p>
-<div class="example"><p><code>require group "cn=Administrators, o=Airius"</code></p></div>
+<div class="example"><p><code>require group cn=Administrators, o=Airius</code></p></div>
<p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapgroupattribute">AuthLDAPGroupAttribute</a></code> and
<code class="directive"><a href="#authldapgroupattributeisdn">AuthLDAPGroupAttributeIsDN</a></code>
@@ -340,11 +341,12 @@
that must match for access to be granted. If the distinguished
name that was retrieved from the directory server matches the
distinguished name in the <code>require dn</code>, then
- authorization is granted.</p>
+ authorization is granted. Note: do not surround the distinguished
+ name with quotes.</p>
<p>The following directive would grant access to a specific
DN:</p>
-<div class="example"><p><code>require dn "cn=Barbara Jenson, o=Airius"</code></p></div>
+<div class="example"><p><code>require dn cn=Barbara Jenson, o=Airius</code></p></div>
<p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></code>
directive.</p>
@@ -358,8 +360,9 @@
Grant access to anyone who exists in the LDAP directory,
using their UID for searches.
-<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br />
-require valid-user
+<div class="example"><p><code>
+ AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)<br />
+ require valid-user
</code></p></div>
</li>
@@ -367,7 +370,7 @@
The next example is the same as above; but with the fields
that have useful defaults omitted. Also, note the use of a
redundant LDAP server.
-<div class="example"><p><code>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br />
+<div class="example"><p><code>AuthLDAPURL ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius<br />
require valid-user
</code></p></div>
</li>
@@ -382,7 +385,7 @@
choose an attribute that is guaranteed unique in your
directory, such as <code>uid</code>.
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br />
+AuthLDAPURL ldap://ldap.airius.com/ou=People, o=Airius?cn<br />
require valid-user
</code></p></div>
</li>
@@ -391,7 +394,7 @@
Grant access to anybody in the Administrators group. The
users must authenticate using their UID.
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid<br />
require group cn=Administrators, o=Airius
</code></p></div>
</li>
@@ -403,7 +406,7 @@
only to people (authenticated via their UID) who have
alphanumeric pagers:
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)<br />
require valid-user
</code></p></div>
</li>
@@ -419,7 +422,7 @@
have a pager, but does need to access the same
resource:</p>
<div class="example"><p><code>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))<br />
require valid-user
</code></p></div>
1.6.2.12 +15 -12 httpd-2.0/docs/manual/mod/mod_auth_ldap.xml
Index: mod_auth_ldap.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_auth_ldap.xml,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -u -u -r1.6.2.11 -r1.6.2.12
--- mod_auth_ldap.xml 17 Apr 2004 18:43:37 -0000 1.6.2.11
+++ mod_auth_ldap.xml 21 May 2004 18:44:28 -0000 1.6.2.12
@@ -297,7 +297,8 @@
<p>This directive specifies an LDAP group whose members are
allowed access. It takes the distinguished name of the LDAP
- group. For example, assume that the following entry existed in
+ group. Note: Do not surround the group name with quotes.
+ For example, assume that the following entry existed in
the LDAP directory:</p>
<example>
dn: cn=Administrators, o=Airius<br />
@@ -308,7 +309,7 @@
<p>The following directive would grant access to both Fred and
Barbara:</p>
-<example>require group "cn=Administrators, o=Airius"</example>
+<example>require group cn=Administrators, o=Airius</example>
<p>Behavior of this directive is modified by the <directive
module="mod_auth_ldap">AuthLDAPGroupAttribute</directive> and
@@ -324,11 +325,12 @@
that must match for access to be granted. If the distinguished
name that was retrieved from the directory server matches the
distinguished name in the <code>require dn</code>, then
- authorization is granted.</p>
+ authorization is granted. Note: do not surround the distinguished
+ name with quotes.</p>
<p>The following directive would grant access to a specific
DN:</p>
-<example>require dn "cn=Barbara Jenson, o=Airius"</example>
+<example>require dn cn=Barbara Jenson, o=Airius</example>
<p>Behavior of this directive is modified by the <directive
module="mod_auth_ldap">AuthLDAPCompareDNOnServer</directive>
@@ -343,8 +345,9 @@
Grant access to anyone who exists in the LDAP directory,
using their UID for searches.
-<example>AuthLDAPURL "ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)"<br />
-require valid-user
+<example>
+ AuthLDAPURL ldap://ldap1.airius.com:389/ou=People, o=Airius?uid?sub?(objectClass=*)<br />
+ require valid-user
</example>
</li>
@@ -352,7 +355,7 @@
The next example is the same as above; but with the fields
that have useful defaults omitted. Also, note the use of a
redundant LDAP server.
-<example>AuthLDAPURL "ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius"<br />
+<example>AuthLDAPURL ldap://ldap1.airius.com ldap2.airius.com/ou=People, o=Airius<br />
require valid-user
</example>
</li>
@@ -367,7 +370,7 @@
choose an attribute that is guaranteed unique in your
directory, such as <code>uid</code>.
<example>
-AuthLDAPURL "ldap://ldap.airius.com/ou=People, o=Airius?cn"<br />
+AuthLDAPURL ldap://ldap.airius.com/ou=People, o=Airius?cn<br />
require valid-user
</example>
</li>
@@ -376,7 +379,7 @@
Grant access to anybody in the Administrators group. The
users must authenticate using their UID.
<example>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid<br />
require group cn=Administrators, o=Airius
</example>
</li>
@@ -388,7 +391,7 @@
only to people (authenticated via their UID) who have
alphanumeric pagers:
<example>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(qpagePagerID=*)<br />
require valid-user
</example>
</li>
@@ -404,7 +407,7 @@
have a pager, but does need to access the same
resource:</p>
<example>
-AuthLDAPURL "ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))"<br />
+AuthLDAPURL ldap://ldap.airius.com/o=Airius?uid??(|(qpagePagerID=*)(uid=jmanager))<br />
require valid-user
</example>
1.12.2.5 +1 -1 httpd-2.0/docs/manual/mod/mod_file_cache.html.en
Index: mod_file_cache.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_file_cache.html.en,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -u -r1.12.2.4 -r1.12.2.5
--- mod_file_cache.html.en 7 May 2004 08:21:03 -0000 1.12.2.4
+++ mod_file_cache.html.en 21 May 2004 18:44:29 -0000 1.12.2.5
@@ -131,7 +131,7 @@
<div class="note"><h3>Note</h3>
- <p>Don't bother asking for a for a directive which recursively
+ <p>Don't bother asking for a directive which recursively
caches all the files in a directory. Try this instead... See the
<code class="directive"><a href="../mod/core.html#include">Include</a></code> directive, and consider
this command:</p>
1.2.2.2 +1 -1 httpd-2.0/docs/manual/mod/mod_file_cache.xml.ko
Index: mod_file_cache.xml.ko
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_file_cache.xml.ko,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -u -r1.2.2.1 -r1.2.2.2
--- mod_file_cache.xml.ko 7 May 2004 08:21:03 -0000 1.2.2.1
+++ mod_file_cache.xml.ko 21 May 2004 18:44:29 -0000 1.2.2.2
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1.3.2.4 -->
+<!-- English Revision: 1.3.2.5 -->
<!--
Copyright 2004 The Apache Software Foundation