Commit dfe5bdaa authored by Andre Malo's avatar Andre Malo
Browse files

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
parent 5c87df10

docs/manual/dns-caveats.xml

+8 −4
Changes for docs/manual/dns-caveats.xml: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -105,13 +105,17 @@ 


    <example>

      &lt;VirtualHost www.abc.dom&gt;<br />

      &nbsp;&nbsp;ServerAdmin webgirl@abc.dom <br />

      &nbsp;&nbsp;DocumentRoot /www/abc <br />

      <indent>

        ServerAdmin webgirl@abc.dom<br />

        DocumentRoot /www/abc<br />

      </indent>

      &lt;/VirtualHost&gt;<br />

      <br />

      &lt;VirtualHost www.def.dom&gt;<br />

      &nbsp;&nbsp;ServerAdmin webguy@def.dom <br />

      &nbsp;&nbsp;DocumentRoot /www/def <br />

      <indent>

        ServerAdmin webguy@def.dom<br />

        DocumentRoot /www/def<br />

      </indent>

      &lt;/VirtualHost&gt;

    </example>

docs/manual/howto/auth.xml

+33 −27
Changes for docs/manual/howto/auth.xml: 33 added lines, 27 removed lines.
Original line number Diff line number Diff line
@@ -466,32 +466,37 @@ person in</title> 
        access is granted. For example the following authorization block would 

        apply the logic:</p>



        <p><var>

        if ((user == "John") || <br />

        &nbsp;&nbsp;&nbsp;((Group == "admin") &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user) &amp;&amp;<br />

        &nbsp;&nbsp;&nbsp;&nbsp;((ldap-attribute dept == "sales") || 

        (file-group contains contains auth'ed_user))))<br />

        then<br />

        &nbsp;&nbsp;auth_granted<br />

        else<br />

        &nbsp;&nbsp;auth_denied<br />

        </var></p>

    

        <example>

          # if ((user == "John") ||<br />

          # &nbsp;&nbsp; ((Group == "admin")<br />

          # &nbsp; &nbsp; &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user)<br />

          # &nbsp; &nbsp; &amp;&amp; ((ldap-attribute dept == "sales")<br />

          # &nbsp; &nbsp; &nbsp; &nbsp; || (file-group contains auth'ed_user))))<br />

          # then<br />

          # &nbsp; auth_granted<br />

          # else<br />

          # &nbsp; auth_denied<br />

          #<br />

          &lt;Directory /www/mydocs&gt;<br />

        &nbsp;  Authname ...<br />

        &nbsp;  AuthBasicProvider ...<br />

        &nbsp;  ...<br />

        &nbsp;  Require user John<br />

        &nbsp;  &lt;SatisfyAll&gt;<br />

        &nbsp;&nbsp;    Require Group admins<br />

        &nbsp;&nbsp;    Require ldap-group cn=mygroup,o=foo<br />

        &nbsp;&nbsp;    &lt;SatisfyOne&gt;<br />

        &nbsp;&nbsp;&nbsp;      Require ldap-attribute dept="sales"<br />

        &nbsp;&nbsp;&nbsp;      Require file-group<br />

        &nbsp;&nbsp;    &lt;/SatisfyOne&gt;<br />

        &nbsp;  &lt;/SatisfyAll&gt;<br />

        &lt;/Directory&gt;<br />

          <indent>

            Authname ...<br />

            AuthBasicProvider ...<br />

            ...<br />

            Require user John<br />

            &lt;SatisfyAll&gt;<br />

            <indent>

              Require Group admins<br />

              Require ldap-group cn=mygroup,o=foo<br />

              &lt;SatisfyOne&gt;<br />

              <indent>

                Require ldap-attribute dept="sales"<br />

                Require file-group<br />

              </indent>

              &lt;/SatisfyOne&gt;<br />

            </indent>

            &lt;/SatisfyAll&gt;<br />

          </indent>

          &lt;/Directory&gt;

        </example>



        <p>By default all <directive module="mod_authz_core">Require</directive>
@@ -562,9 +567,10 @@ person in</title> 
    

        <example>

          &lt;SatisfyAll&gt;<br />

          &nbsp;  Reject ip <var>192.101.205</var><br />

          &nbsp;  Reject host <var>cyberthugs.com</var> <var>moreidiots.com</var><br />

          &nbsp;  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>

          &lt;/SatisfyAll&gt;

        </example>

docs/manual/mod/mod_authz_core.xml

+29 −25
Changes for docs/manual/mod/mod_authz_core.xml: 29 added lines, 25 removed lines.
Original line number Diff line number Diff line
@@ -156,34 +156,38 @@ for 'AND' logic to be applied to various authorization providers.</description> 
    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 />

    &nbsp;&nbsp;&nbsp;((Group == "admin") &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user) &amp;&amp;<br />

    &nbsp;&nbsp;&nbsp;&nbsp;((ldap-attribute dept == "sales") || 

    (file-group contains contains auth'ed_user))))<br />

    then<br />

    &nbsp;&nbsp;auth_granted<br />

    else<br />

    &nbsp;&nbsp;auth_denied<br />

    </var></p>



    <example>

      # if ((user == "John") ||<br />

      # &nbsp;&nbsp; ((Group == "admin")<br />

      # &nbsp; &nbsp; &amp;&amp; (ldap-group &lt;ldap-object&gt; contains auth'ed_user)<br />

      # &nbsp; &nbsp; &amp;&amp; ((ldap-attribute dept == "sales")<br />

      # &nbsp; &nbsp; &nbsp; &nbsp; || (file-group contains auth'ed_user))))<br />

      # then<br />

      # &nbsp; auth_granted<br />

      # else<br />

      # &nbsp; auth_denied<br />

      #<br />

      &lt;Directory /www/mydocs&gt;<br />

    &nbsp;  Authname ...<br />

    &nbsp;  AuthBasicProvider ...<br />

    &nbsp;  ...<br />

    &nbsp;  Require user John<br />

    &nbsp;  &lt;SatisfyAll&gt;<br />

    &nbsp;&nbsp;    Require Group admins<br />

    &nbsp;&nbsp;    Require ldap-group cn=mygroup,o=foo<br />

    &nbsp;&nbsp;    &lt;SatisfyOne&gt;<br />

    &nbsp;&nbsp;&nbsp;      Require ldap-attribute dept="sales"<br />

    &nbsp;&nbsp;&nbsp;      Require file-group<br />

    &nbsp;&nbsp;    &lt;/SatisfyOne&gt;<br />

    &nbsp;  &lt;/SatisfyAll&gt;<br />

    &lt;/Directory&gt;<br />

      <indent>

        Authname ...<br />

        AuthBasicProvider ...<br />

        ...<br />

        Require user John<br />

        &lt;SatisfyAll&gt;<br />

        <indent>

          Require Group admins<br />

          Require ldap-group cn=mygroup,o=foo<br />

          &lt;SatisfyOne&gt;<br />

          <indent>

            Require ldap-attribute dept="sales"<br />

            Require file-group<br />

          </indent>

          &lt;/SatisfyOne&gt;<br />

        </indent>

        &lt;/SatisfyAll&gt;<br />

      </indent>

      &lt;/Directory&gt;

    </example>



</usage>



<seealso><a href="../howto/auth.html">Authentication, Authorization,