Commit da43df92 authored by Bradley Nicholes's avatar Bradley Nicholes
Browse files

Remove the references to the Satisfy directive from the documentation since... 

Remove the references to the Satisfy directive from the documentation since this directive no longer exists

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/authz-dev@366521 13f79535-47bb-0310-9956-ffa450edef68
parent f1e16440

docs/manual/developer/request.xml

+6 −44
Original line number Diff line number Diff line
@@ -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_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;



case SATISFY_ANY:

    if (((access_status = ap_run_access_checker(r)) != 0)) {

        if (!ap_some_auth_required(r)) {

            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_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;

}</pre>

    </pre>

    </example>

</section>

docs/manual/mod/mod_auth_digest.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

docs/manual/mod/mod_authz_dbd.xml

+0 −1
Original line number Diff line number Diff line
@@ -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>

docs/manual/mod/mod_authz_dbm.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
</summary>



<seealso><directive module="core">Require</directive></seealso>

<seealso><directive module="core">Satisfy</directive></seealso>



<directivesynopsis>

<name>AuthDBMGroupFile</name>

docs/manual/mod/mod_authz_groupfile.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
</summary>



<seealso><directive module="core">Require</directive></seealso>

<seealso><directive module="core">Satisfy</directive></seealso>



<directivesynopsis>

<name>AuthGroupFile</name>