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 2006/02/17 18:39:59 UTC
svn commit: r378577 - in /httpd/httpd/trunk/docs/manual: dns-caveats.xml
howto/auth.xml mod/mod_authz_core.xml
Author: nd
Date: Fri Feb 17 09:39:47 2006
New Revision: 378577
URL: http://svn.apache.org/viewcvs?rev=378577&view=rev
Log:
don't use in configuration code that might be copy and pasted and cannot
be interpreted correctly by the httpd
Modified:
httpd/httpd/trunk/docs/manual/dns-caveats.xml
httpd/httpd/trunk/docs/manual/howto/auth.xml
httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml
Modified: httpd/httpd/trunk/docs/manual/dns-caveats.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/dns-caveats.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/dns-caveats.xml (original)
+++ httpd/httpd/trunk/docs/manual/dns-caveats.xml Fri Feb 17 09:39:47 2006
@@ -104,14 +104,18 @@
configuration snippet:</p>
<example>
- <VirtualHost www.abc.dom> <br />
- ServerAdmin webgirl@abc.dom <br />
- DocumentRoot /www/abc <br />
- </VirtualHost> <br />
+ <VirtualHost www.abc.dom><br />
+ <indent>
+ ServerAdmin webgirl@abc.dom<br />
+ DocumentRoot /www/abc<br />
+ </indent>
+ </VirtualHost><br />
<br />
- <VirtualHost www.def.dom> <br />
- ServerAdmin webguy@def.dom <br />
- DocumentRoot /www/def <br />
+ <VirtualHost www.def.dom><br />
+ <indent>
+ ServerAdmin webguy@def.dom<br />
+ DocumentRoot /www/def<br />
+ </indent>
</VirtualHost>
</example>
Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/howto/auth.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml Fri Feb 17 09:39:47 2006
@@ -466,32 +466,37 @@
access is granted. For example the following authorization block would
apply the logic:</p>
- <p><var>
- if ((user == "John") || <br />
- ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&<br />
- ((ldap-attribute dept == "sales") ||
- (file-group contains contains auth'ed_user))))<br />
- then<br />
- auth_granted<br />
- else<br />
- auth_denied<br />
- </var></p>
-
- <example>
- <Directory /www/mydocs><br />
- Authname ...<br />
- AuthBasicProvider ...<br />
- ...<br />
- Require user John<br />
- <SatisfyAll><br />
- Require Group admins<br />
- Require ldap-group cn=mygroup,o=foo<br />
- <SatisfyOne><br />
- Require ldap-attribute dept="sales"<br />
- Require file-group<br />
- </SatisfyOne><br />
- </SatisfyAll><br />
- </Directory><br />
+ <example>
+ # if ((user == "John") ||<br />
+ # ((Group == "admin")<br />
+ # && (ldap-group <ldap-object> contains auth'ed_user)<br />
+ # && ((ldap-attribute dept == "sales")<br />
+ # || (file-group contains auth'ed_user))))<br />
+ # then<br />
+ # auth_granted<br />
+ # else<br />
+ # auth_denied<br />
+ #<br />
+ <Directory /www/mydocs><br />
+ <indent>
+ Authname ...<br />
+ AuthBasicProvider ...<br />
+ ...<br />
+ Require user John<br />
+ <SatisfyAll><br />
+ <indent>
+ Require Group admins<br />
+ Require ldap-group cn=mygroup,o=foo<br />
+ <SatisfyOne><br />
+ <indent>
+ Require ldap-attribute dept="sales"<br />
+ Require file-group<br />
+ </indent>
+ </SatisfyOne><br />
+ </indent>
+ </SatisfyAll><br />
+ </indent>
+ </Directory>
</example>
<p>By default all <directive module="mod_authz_core">Require</directive>
@@ -562,9 +567,10 @@
<example>
<SatisfyAll><br />
- Reject ip <var>192.101.205</var><br />
- Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />
- Reject host ke<br />
+ <indent>
+ Reject ip <var>192.101.205</var><br />
+ Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br /> Reject host ke<br />
+ </indent>
</SatisfyAll>
</example>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml?rev=378577&r1=378576&r2=378577&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_core.xml Fri Feb 17 09:39:47 2006
@@ -156,34 +156,38 @@
allow you to apply "AND" and "OR" logic to the authorization processing.
For example the following authorization block would apply the logic:</p>
- <p><var>
- if ((user == "John") || <br />
- ((Group == "admin") && (ldap-group <ldap-object> contains auth'ed_user) &&<br />
- ((ldap-attribute dept == "sales") ||
- (file-group contains contains auth'ed_user))))<br />
- then<br />
- auth_granted<br />
- else<br />
- auth_denied<br />
- </var></p>
-
<example>
- <Directory /www/mydocs><br />
- Authname ...<br />
- AuthBasicProvider ...<br />
- ...<br />
- Require user John<br />
- <SatisfyAll><br />
- Require Group admins<br />
- Require ldap-group cn=mygroup,o=foo<br />
- <SatisfyOne><br />
- Require ldap-attribute dept="sales"<br />
- Require file-group<br />
- </SatisfyOne><br />
- </SatisfyAll><br />
- </Directory><br />
+ # if ((user == "John") ||<br />
+ # ((Group == "admin")<br />
+ # && (ldap-group <ldap-object> contains auth'ed_user)<br />
+ # && ((ldap-attribute dept == "sales")<br />
+ # || (file-group contains auth'ed_user))))<br />
+ # then<br />
+ # auth_granted<br />
+ # else<br />
+ # auth_denied<br />
+ #<br />
+ <Directory /www/mydocs><br />
+ <indent>
+ Authname ...<br />
+ AuthBasicProvider ...<br />
+ ...<br />
+ Require user John<br />
+ <SatisfyAll><br />
+ <indent>
+ Require Group admins<br />
+ Require ldap-group cn=mygroup,o=foo<br />
+ <SatisfyOne><br />
+ <indent>
+ Require ldap-attribute dept="sales"<br />
+ Require file-group<br />
+ </indent>
+ </SatisfyOne><br />
+ </indent>
+ </SatisfyAll><br />
+ </indent>
+ </Directory>
</example>
-
</usage>
<seealso><a href="../howto/auth.html">Authentication, Authorization,