From: André Malo Date: Thu, 4 Nov 2004 22:14:41 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.1.1~62 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fd9239ad430601e680fad9dabd8107516a15605;p=apache update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105687 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index c2ae155328..f9f9405e7a 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -111,6 +111,7 @@ for HTTP Basic authentication.
  • require ldap-user
  • require ldap-group
  • require ldap-dn
    • +
  • require ldap-attribute
    • @@ -230,6 +231,11 @@ for HTTP Basic authentication. the DN fetched from the LDAP directory (or the username passed by the client) occurs in the LDAP group. +
  • Grant access if there is a + require ldap-attribute + directive, and the attribute fetched from the LDAP directory + matches the given value.
    • +
  • otherwise, deny or decline access
    • @@ -294,9 +300,10 @@ for HTTP Basic authentication.

    Apache's Require 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 ldap-user, ldap-dn - and ldap-group. Other authorization types may also be - used but may require that additional authorization modules be loaded.

    + authorization types with ldap-user, ldap-dn, + ldap-group and ldap-attribute. Other + authorization types may also be used but may require that additional + authorization modules be loaded.

    require valid-user

    @@ -383,6 +390,34 @@ uniqueMember: cn=Fred User, o=Airius

    Behavior of this directive is modified by the AuthLDAPCompareDNOnServer directive.

    + +

    require ldap-attribute

    + +

    The require ldap-attribute 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.

    + +

    The following directive would grant access to anyone with + the attribute employeeType = active

    + +

    require ldap-attribute employeeType=active

    + +

    Multiple attribute/value pairs can be specified on the same line + separated by spaces or they can be specified in multiple + require ldap-attribute 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.

    + +

    The following directive would grant access to anyone with + the city attribute equal to "San Jose" or status equal to "Active"

    + +

    require ldap-attribute city="San Jose" status=active

    + + +
    top

    Examples

    diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 965cf83bf3..624a49c300 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -795,6 +795,17 @@ query can be done in two ways which can be configured by dialog (i.e. when you use a single Pass Phrase for all N Private Key files this Pass Phrase is queried only once).

    +
  • |/path/to/program [args...] + +

    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 builtin mode on + stdin, and is expected to write password strings on + stdout. 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.

    • +
  • exec:/path/to/program

    Here an external program is configured which is called at startup for each diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en index 811c94bb6a..f1baf5e07f 100644 --- a/docs/manual/vhosts/examples.html.en +++ b/docs/manual/vhosts/examples.html.en @@ -516,7 +516,9 @@ www.example.org (from our name-based 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.
    + variants during a migration phase.

    + +

    The solution is easy, because we can simply add the new IP address (172.20.30.50) to the VirtualHost directive.

    @@ -611,11 +613,13 @@ http://www.sub1.domain.tld/ is only served from the sub1-vhost if the client sent a correct Host: header. If no Host: header is sent the - client gets the information page from the primary host.
    - Please note that there is one oddity: A request to + client gets the information page from the primary host.

    + +

    Please note that there is one oddity: A request to http://www.sub2.domain.tld/sub1/ is also served from the - sub1-vhost if the client sent no Host: header.
    - The RewriteRule directives + sub1-vhost if the client sent no Host: header.

    + +

    The RewriteRule directives are used to make sure that a client which sent a correct Host: header can use both URL variants, i.e., with or without URL prefix.

    diff --git a/docs/manual/vhosts/examples.html.ko.euc-kr b/docs/manual/vhosts/examples.html.ko.euc-kr index 41242eb4e1..f3b5fd4a32 100644 --- a/docs/manual/vhosts/examples.html.ko.euc-kr +++ b/docs/manual/vhosts/examples.html.ko.euc-kr @@ -21,6 +21,8 @@

    °¡´ÉÇÑ ¾ð¾î:  en  |  ko 

    • +
    ÀÌ ¹®¼­´Â ÃÖ½ÅÆÇ ¹ø¿ªÀÌ ¾Æ´Õ´Ï´Ù. + ÃÖ±Ù¿¡ º¯°æµÈ ³»¿ëÀº ¿µ¾î ¹®¼­¸¦ Âü°íÇϼ¼¿ä.

    ÀÌ ¹®¼­´Â ÀÚÁÖ ¹®ÀǵǴ °¡»óÈ£½ºÆ® diff --git a/docs/manual/vhosts/examples.xml.ko b/docs/manual/vhosts/examples.xml.ko index 1f682d242a..ec2fc44cc3 100644 --- a/docs/manual/vhosts/examples.xml.ko +++ b/docs/manual/vhosts/examples.xml.ko @@ -1,7 +1,7 @@ - +