You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2006/01/06 17:25:58 UTC
svn commit: r366521 - in /httpd/httpd/branches/authz-dev/docs/manual:
developer/request.xml mod/mod_auth_digest.xml mod/mod_authz_dbd.xml
mod/mod_authz_dbm.xml mod/mod_authz_groupfile.xml mod/mod_authz_owner.xml
mod/mod_authz_user.xml
Author: bnicholes
Date: Fri Jan 6 08:25:42 2006
New Revision: 366521
URL: http://svn.apache.org/viewcvs?rev=366521&view=rev
Log:
Remove the references to the Satisfy directive from the documentation since this directive no longer exists
Modified:
httpd/httpd/branches/authz-dev/docs/manual/developer/request.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_auth_digest.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbd.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbm.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_groupfile.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_owner.xml
httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_user.xml
Modified: httpd/httpd/branches/authz-dev/docs/manual/developer/request.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/developer/request.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/developer/request.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/developer/request.xml Fri Jan 6 08:25:42 2006
@@ -149,56 +149,18 @@
<p>Needs Documentation. Code is:</p>
<example><pre>
-switch (ap_satisfies(r)) {
-case SATISFY_ALL:
-case SATISFY_NOSPEC:
- if ((access_status = ap_run_access_checker(r)) != 0) {
- return decl_die(access_status, "check access", r);
- }
-
- if (ap_some_auth_required(r)) {
- if (((access_status = ap_run_check_user_id(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check user. No user file?"
- : "perform authentication. AuthType not set!",
- r);
- }
-
- if (((access_status = ap_run_auth_checker(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check access. No groups file?"
- : "perform authentication. AuthType not set!",
- r);
- }
- }
- break;
-
-case SATISFY_ANY:
- if (((access_status = ap_run_access_checker(r)) != 0)) {
- if (!ap_some_auth_required(r)) {
+ if ((access_status = ap_run_access_checker(r)) != 0) {
return decl_die(access_status, "check access", r);
}
- if (((access_status = ap_run_check_user_id(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check user. No user file?"
- : "perform authentication. AuthType not set!",
- r);
+ if ((access_status = ap_run_check_user_id(r)) != 0) {
+ return decl_die(access_status, "check user", r);
}
- if (((access_status = ap_run_auth_checker(r)) != 0)
- || !ap_auth_type(r)) {
- return decl_die(access_status, ap_auth_type(r)
- ? "check access. No groups file?"
- : "perform authentication. AuthType not set!",
- r);
+ if ((access_status = ap_run_auth_checker(r)) != 0) {
+ return decl_die(access_status, "check authorization", r);
}
- }
- break;
-}</pre>
+ </pre>
</example>
</section>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_auth_digest.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_auth_digest.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_auth_digest.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_auth_digest.xml Fri Jan 6 08:25:42 2006
@@ -38,7 +38,6 @@
<seealso><directive module="core">AuthName</directive></seealso>
<seealso><directive module="core">AuthType</directive></seealso>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
<section id="using"><title>Using Digest Authentication</title>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbd.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbd.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbd.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbd.xml Fri Jan 6 08:25:42 2006
@@ -38,7 +38,6 @@
</summary>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
<seealso><directive module="mod_dbd">DBDriver</directive></seealso>
<seealso><directive module="mod_dbd">DBDParams</directive></seealso>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbm.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbm.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbm.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_dbm.xml Fri Jan 6 08:25:42 2006
@@ -37,7 +37,6 @@
</summary>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
<directivesynopsis>
<name>AuthDBMGroupFile</name>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_groupfile.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_groupfile.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_groupfile.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_groupfile.xml Fri Jan 6 08:25:42 2006
@@ -37,7 +37,6 @@
</summary>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
<directivesynopsis>
<name>AuthGroupFile</name>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_owner.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_owner.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_owner.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_owner.xml Fri Jan 6 08:25:42 2006
@@ -70,7 +70,6 @@
</note>
</summary>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
<section id="examples"><title>Configuration Examples</title>
@@ -93,7 +92,6 @@
AuthName MyPrivateFiles<br />
AuthBasicProvider dbm<br />
AuthDBMUserFile /usr/local/apache2/etc/.htdbm-all<br />
- Satisfy All<br />
Require file-owner<br />
</indent>
</Directory>
Modified: httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_user.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_user.xml?rev=366521&r1=366520&r2=366521&view=diff
==============================================================================
--- httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_user.xml (original)
+++ httpd/httpd/branches/authz-dev/docs/manual/mod/mod_authz_user.xml Fri Jan 6 08:25:42 2006
@@ -38,6 +38,5 @@
grant access to all successfully authenticated users.</p>
</summary>
<seealso><directive module="core">Require</directive></seealso>
-<seealso><directive module="core">Satisfy</directive></seealso>
</modulesynopsis>