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/11/04 23:14:41 UTC
cvs commit: httpd-2.0/docs/manual/vhosts examples.html.en examples.html.ko.euc-kr examples.xml.ko examples.xml.meta
nd 2004/11/04 14:14:41
Modified: docs/manual/mod mod_authnz_ldap.html.en mod_ssl.html.en
docs/manual/vhosts examples.html.en examples.html.ko.euc-kr
examples.xml.ko examples.xml.meta
Log:
update transformation
Revision Changes Path
1.3 +38 -3 httpd-2.0/docs/manual/mod/mod_authnz_ldap.html.en
Index: mod_authnz_ldap.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_authnz_ldap.html.en,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- mod_authnz_ldap.html.en 9 Oct 2004 19:44:22 -0000 1.2
+++ mod_authnz_ldap.html.en 4 Nov 2004 22:14:41 -0000 1.3
@@ -111,6 +111,7 @@
<li><a href="#requser">require ldap-user</a></li>
<li><a href="#reqgroup">require ldap-group</a></li>
<li><a href="#reqdn">require ldap-dn</a></li>
+ <li><a href="#reqattribute">require ldap-attribute</a></li>
</ul>
</li>
@@ -230,6 +231,11 @@
the DN fetched from the LDAP directory (or the username
passed by the client) occurs in the LDAP group.</li>
+ <li>Grant access if there is a <a href="#reqattribute">
+ <code>require ldap-attribute</code></a>
+ directive, and the attribute fetched from the LDAP directory
+ matches the given value.</li>
+
<li>otherwise, deny or decline access</li>
</ul>
@@ -294,9 +300,10 @@
<p>Apache's <code class="directive"><a href="../mod/core.html#require">Require</a></code>
directives are used during the authorization phase to ensure that
a user is allowed to access a resource. mod_authnz_ldap extends the
- authorization types with <code>ldap-user</code>, <code>ldap-dn</code>
- and <code>ldap-group</code>. Other authorization types may also be
- used but may require that additional authorization modules be loaded.</p>
+ authorization types with <code>ldap-user</code>, <code>ldap-dn</code>,
+ <code>ldap-group</code> and <code>ldap-attribute</code>. Other
+ authorization types may also be used but may require that additional
+ authorization modules be loaded.</p>
<h3><a name="reqvaliduser" id="reqvaliduser">require valid-user</a></h3>
@@ -382,6 +389,34 @@
<p>Behavior of this directive is modified by the <code class="directive"><a href="#authldapcomparednonserver">AuthLDAPCompareDNOnServer</a></code>
directive.</p>
+
+
+<h3><a name="reqattribute" id="reqattribute">require ldap-attribute</a></h3>
+
+ <p>The <code>require ldap-attribute</code> directive allows the
+ administrator to grant access based on attributes of the authenticated
+ user in the LDAP directory. If the attribute in the directory
+ matches the value given in the configuration, access is granted.</p>
+
+ <p>The following directive would grant access to anyone with
+ the attribute employeeType = active</p>
+
+ <div class="example"><p><code>require ldap-attribute employeeType=active</code></p></div>
+
+ <p>Multiple attribute/value pairs can be specified on the same line
+ separated by spaces or they can be specified in multiple
+ <code>require ldap-attribute</code> directives. The effect of listing
+ multiple attribute/values pairs is an OR operation. Access will be
+ granted if any of the listed attribute values match the value of the
+ corresponding attribute in the user object. If the value of the
+ attribute contains a space, only the value must be within double quotes.</p>
+
+ <p>The following directive would grant access to anyone with
+ the city attribute equal to "San Jose" or status equal to "Active"</p>
+
+ <div class="example"><p><code>require ldap-attribute city="San Jose" status=active</code></p></div>
+
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
1.36 +11 -0 httpd-2.0/docs/manual/mod/mod_ssl.html.en
Index: mod_ssl.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_ssl.html.en,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -u -r1.35 -r1.36
--- mod_ssl.html.en 23 Aug 2004 15:28:36 -0000 1.35
+++ mod_ssl.html.en 4 Nov 2004 22:14:41 -0000 1.36
@@ -795,6 +795,17 @@
dialog (i.e. when you use a single Pass Phrase for all N Private Key files
this Pass Phrase is queried only once).</p></li>
+<li><code>|/path/to/program [args...]</code>
+
+ <p>This mode allows an external program to be used which acts as a
+ pipe to a particular input device; the program is sent the standard
+ prompt text used for the <code>builtin</code> mode on
+ <code>stdin</code>, and is expected to write password strings on
+ <code>stdout</code>. If several passwords are needed (or an
+ incorrect password is entered), additional prompt text will be
+ written subsequent to the first password being returned, and more
+ passwords must then be written back.</p></li>
+
<li><code>exec:/path/to/program</code>
<p>
Here an external program is configured which is called at startup for each
1.15 +9 -5 httpd-2.0/docs/manual/vhosts/examples.html.en
Index: examples.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/examples.html.en,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- examples.html.en 19 Oct 2004 16:28:36 -0000 1.14
+++ examples.html.en 4 Nov 2004 22:14:41 -0000 1.15
@@ -516,7 +516,9 @@
<code>www.example.org</code> (from our <a href="#name">name-based</a> example, setup 2) should get its own IP
address. To avoid problems with name servers or proxies who cached the
old IP address for the name-based vhost we want to provide both
- variants during a migration phase.<br />
+ variants during a migration phase.</p>
+
+ <p>
The solution is easy, because we can simply add the new IP address
(<code>172.20.30.50</code>) to the <code>VirtualHost</code>
directive.</p>
@@ -611,11 +613,13 @@
<code>http://www.sub1.domain.tld/</code> is only
served from the sub1-vhost if the client sent a correct
<code>Host:</code> header. If no <code>Host:</code> header is sent the
- client gets the information page from the primary host.<br />
- Please note that there is one oddity: A request to
+ client gets the information page from the primary host.</p>
+
+ <p>Please note that there is one oddity: A request to
<code>http://www.sub2.domain.tld/sub1/</code> is also served from the
- sub1-vhost if the client sent no <code>Host:</code> header.<br />
- The <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives
+ sub1-vhost if the client sent no <code>Host:</code> header.</p>
+
+ <p>The <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> directives
are used to make sure that a client which sent a correct
<code>Host:</code> header can use both URL variants, <em>i.e.</em>,
with or without URL prefix.</p>
1.10 +2 -0 httpd-2.0/docs/manual/vhosts/examples.html.ko.euc-kr
Index: examples.html.ko.euc-kr
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/examples.html.ko.euc-kr,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- examples.html.ko.euc-kr 22 Sep 2004 09:39:36 -0000 1.9
+++ examples.html.ko.euc-kr 4 Nov 2004 22:14:41 -0000 1.10
@@ -21,6 +21,8 @@
<p><span>������ ���: </span><a href="../en/vhosts/examples.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../ko/vhosts/examples.html" title="Korean"> ko </a></p>
</div>
+<div class="outofdate">�� ������ �ֽ��� ������ �ƴմϴ�.
+ �ֱٿ� ����� ������ ���� ������ �����ϼ���.</div>
<p>�� ������ ���� ���ǵǴ� ����ȣ��Ʈ
1.11 +1 -1 httpd-2.0/docs/manual/vhosts/examples.xml.ko
Index: examples.xml.ko
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/examples.xml.ko,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- examples.xml.ko 19 Oct 2004 16:28:36 -0000 1.10
+++ examples.xml.ko 4 Nov 2004 22:14:41 -0000 1.11
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 1.11 -->
+<!-- English Revision: 1.11 (outdated: 1.12) -->
<!--
Copyright 2003-2004 The Apache Software Foundation
1.7 +1 -1 httpd-2.0/docs/manual/vhosts/examples.xml.meta
Index: examples.xml.meta
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/vhosts/examples.xml.meta,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- examples.xml.meta 22 Sep 2004 09:39:36 -0000 1.6
+++ examples.xml.meta 4 Nov 2004 22:14:41 -0000 1.7
@@ -7,6 +7,6 @@
<variants>
<variant>en</variant>
- <variant>ko</variant>
+ <variant outdated="yes">ko</variant>
</variants>
</metafile>