From f9fba91054b347854c0da3eb7ba3d6fc668284ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Fri, 17 Feb 2006 17:39:47 +0000 Subject: [PATCH] don't use   in configuration code that might be copy and pasted and cannot be interpreted correctly by the httpd git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@378577 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/dns-caveats.xml | 18 +++++---- docs/manual/howto/auth.xml | 62 ++++++++++++++++-------------- docs/manual/mod/mod_authz_core.xml | 56 ++++++++++++++------------- 3 files changed, 75 insertions(+), 61 deletions(-) diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index a7d4a1da1ca..74af02ca1e0 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -104,14 +104,18 @@ configuration snippet:

- <VirtualHost www.abc.dom>
-   ServerAdmin webgirl@abc.dom
-   DocumentRoot /www/abc
- </VirtualHost>
+ <VirtualHost www.abc.dom>
+ + ServerAdmin webgirl@abc.dom
+ DocumentRoot /www/abc
+ + </VirtualHost>

- <VirtualHost www.def.dom>
-   ServerAdmin webguy@def.dom
-   DocumentRoot /www/def
+ <VirtualHost www.def.dom>
+ + ServerAdmin webguy@def.dom
+ DocumentRoot /www/def
+ </VirtualHost> diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 728c05812d1..c19e3f8f883 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -466,32 +466,37 @@ person in access is granted. For example the following authorization block would apply the logic:

-

- if ((user == "John") ||
-    ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&
-     ((ldap-attribute dept == "sales") || - (file-group contains contains auth'ed_user))))
- then
-   auth_granted
- else
-   auth_denied
-

- - <Directory /www/mydocs>
-   Authname ...
-   AuthBasicProvider ...
-   ...
-   Require user John
-   <SatisfyAll>
-    Require Group admins
-    Require ldap-group cn=mygroup,o=foo
-    <SatisfyOne>
-     Require ldap-attribute dept="sales"
-     Require file-group
-    </SatisfyOne>
-   </SatisfyAll>
- </Directory>
+ # if ((user == "John") ||
+ #    ((Group == "admin")
+ #     && (ldap-group <ldap-object> contains auth'ed_user)
+ #     && ((ldap-attribute dept == "sales")
+ #         || (file-group contains auth'ed_user))))
+ # then
+ #   auth_granted
+ # else
+ #   auth_denied
+ #
+ <Directory /www/mydocs>
+ + Authname ...
+ AuthBasicProvider ...
+ ...
+ Require user John
+ <SatisfyAll>
+ + Require Group admins
+ Require ldap-group cn=mygroup,o=foo
+ <SatisfyOne>
+ + Require ldap-attribute dept="sales"
+ Require file-group
+ + </SatisfyOne>
+ + </SatisfyAll>
+ + </Directory>

By default all Require @@ -562,9 +567,10 @@ person in <SatisfyAll>
-   Reject ip 192.101.205
-   Reject host cyberthugs.com moreidiots.com
-   Reject host ke
+ + Reject ip 192.101.205
+ Reject host cyberthugs.com moreidiots.com
Reject host ke
+ </SatisfyAll> diff --git a/docs/manual/mod/mod_authz_core.xml b/docs/manual/mod/mod_authz_core.xml index 43219c1d798..d61de7e0662 100644 --- a/docs/manual/mod/mod_authz_core.xml +++ b/docs/manual/mod/mod_authz_core.xml @@ -156,34 +156,38 @@ for 'AND' logic to be applied to various authorization providers. allow you to apply "AND" and "OR" logic to the authorization processing. For example the following authorization block would apply the logic:

-

- if ((user == "John") ||
-    ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&
-     ((ldap-attribute dept == "sales") || - (file-group contains contains auth'ed_user))))
- then
-   auth_granted
- else
-   auth_denied
-

- - <Directory /www/mydocs>
-   Authname ...
-   AuthBasicProvider ...
-   ...
-   Require user John
-   <SatisfyAll>
-    Require Group admins
-    Require ldap-group cn=mygroup,o=foo
-    <SatisfyOne>
-     Require ldap-attribute dept="sales"
-     Require file-group
-    </SatisfyOne>
-   </SatisfyAll>
- </Directory>
+ # if ((user == "John") ||
+ #    ((Group == "admin")
+ #     && (ldap-group <ldap-object> contains auth'ed_user)
+ #     && ((ldap-attribute dept == "sales")
+ #         || (file-group contains auth'ed_user))))
+ # then
+ #   auth_granted
+ # else
+ #   auth_denied
+ #
+ <Directory /www/mydocs>
+ + Authname ...
+ AuthBasicProvider ...
+ ...
+ Require user John
+ <SatisfyAll>
+ + Require Group admins
+ Require ldap-group cn=mygroup,o=foo
+ <SatisfyOne>
+ + Require ldap-attribute dept="sales"
+ Require file-group
+ + </SatisfyOne>
+ + </SatisfyAll>
+ + </Directory> - Authentication, Authorization, -- 2.47.3