Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-os-access-fix-regression-in-server-interpreted-auth.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-os-access-fix-regression-in-server-interpreted-auth.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  diff --git a/os/access.c b/os/access.c
       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server' type='application/atom+xml'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/os-access-fix-regression-in-server-interpreted-auth.patch'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>os-access-fix-regression-in-server-interpreted-auth.patch</a></div><div class='content'>blob: b96bb7a31743b849f52f5c17212b433348799f4d (<a href='/svntogit/packages.git/plain/trunk/os-access-fix-regression-in-server-interpreted-auth.patch?h=packages/xorg-server'>plain</a>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     </pre></td>  
     <td class='lines'><pre><code>diff --git a/os/access.c b/os/access.c  
    2  index 28f2d32..fe6e831 100644  index 28f2d32..fe6e831 100644
    3  <span class="hl kwb">--- a/os/access.c</span>  --- a/os/access.c
    4  <span class="hl kwa">+++ b/os/access.c</span>  +++ b/os/access.c
    5  &#64;&#64; -1390,14 +1390,23 &#64;&#64; InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)  @@ -1390,14 +1390,23 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
    6           else           else
    7               return 0;               return 0;
    8       }       }
    9  <span class="hl kwa">+</span>  +
    10  <span class="hl kwa">+    /* An empty address requires both a NULL addr *and* a zero length</span>  +    /* An empty address requires both a NULL addr *and* a zero length
    11  <span class="hl kwa">+     * as the address comparison functions call memcmp with both</span>  +     * as the address comparison functions call memcmp with both
    12  <span class="hl kwa">+     * parameters. Make sure they agree here</span>  +     * parameters. Make sure they agree here
    13  <span class="hl kwa">+     */</span>  +     */
    14  <span class="hl kwa">+    if (addr == NULL)</span>  +    if (addr == NULL)
    15  <span class="hl kwa">+        len = 0;</span>  +        len = 0;
    16  <span class="hl kwa">+    if (len == 0)</span>  +    if (len == 0)
    17  <span class="hl kwa">+        addr = NULL;</span>  +        addr = NULL;
    18       for (host = validhosts; host; host = host-&gt;next) {       for (host = validhosts; host; host = host->next) {
    19           if (host-&gt;family == FamilyServerInterpreted) {           if (host->family == FamilyServerInterpreted) {
    20  <span class="hl kwb">-            if (addr &amp;&amp; siAddrMatch(family, addr, len, host, client)) {</span>  -            if (addr && siAddrMatch(family, addr, len, host, client)) {
    21  <span class="hl kwa">+            if (siAddrMatch(family, addr, len, host, client)) {</span>  +            if (siAddrMatch(family, addr, len, host, client)) {
    22                   return 0;                   return 0;
    23               }               }
    24           }           }
    25           else {           else {
    26  <span class="hl kwb">-            if (addr &amp;&amp; addrEqual(family, addr, len, host))</span>  -            if (addr && addrEqual(family, addr, len, host))
    27  <span class="hl kwa">+            if (addrEqual(family, addr, len, host))</span>  +            if (addrEqual(family, addr, len, host))
    28                   return 0;                   return 0;
    29           }           }
    30    
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576