qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xauth 1.0.3 + fixes from git head. Partially addresses system/6097.

Browse Source
This commit is contained in:
matthieu 2009-03-08 09:35:07 +00:00
parent 9825393382
commit 8563657009
5 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/xauth/COPYING
View File

@ -1,12 +1,21 @@
This is a stub file. This package has not yet had its complete licensing
information compiled. Please see the individual source files for details on
your rights to use and modify this software.
Copyright 1989, 1993, 1998 The Open Group
Please submit updated COPYING files to the Xorg bugzilla:
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
All licensing questions regarding this software should be directed at the
Xorg mailing list:
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
http://lists.freedesktop.org/mailman/listinfo/xorg
Except as contained in this notice, the name of The Open Group shall not be
used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.

26
app/xauth/ChangeLog
View File

@ -1,3 +1,29 @@
commit 65a0917d4661e370b50beed8f06f5577bfeea59f
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Thu Jan 10 21:15:56 2008 -0800
get_address_info: don't allow duplicate entries to be returned in the list
OS-X's getaddrinfo() can return duplicate entries (and does for localhost with
the default 10.5 /etc/hosts). This caused some annoying crashes which this
patch takes care of.
See http://trac.macosforge.org/projects/xquartz/ticket/44
commit 40e1769f4c631713c32c73a5244f3d65aea89ab7
Author: Jeremy Huddleston <jeremy@tifa.local>
Date: Sat Dec 1 20:01:23 2007 -0800
Added support for launchd socket
From Martin Costabel
commit 60615bc52f685b7ddfd574e10ed8fdcf2b6e43f5
Author: Daniel Drake <ddrake@brontes3d.com>
Date: Wed May 16 14:24:00 2007 -0800
Bug #10971: xauth COPYING file
X.Org Bugzilla #10971 <https://bugs.freedesktop.org/show_bug.cgi?id=10971>
commit a1602ecd22a800a6c5348c00fece3287cdcf00ce
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Tue Dec 12 15:00:29 2006 -0800

3
app/xauth/configure.ac
View File

@ -1,4 +1,3 @@
dnl Copyright 2005 Red Hat, Inc.
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -22,7 +21,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT(xauth,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AC_INIT(xauth,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xauth)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE

11
app/xauth/gethost.c
View File

@ -295,6 +295,8 @@ struct addrlist *get_address_info (
hints.ai_protocol = 0;
if (getaddrinfo(host,NULL,&hints,&firstai) !=0) return NULL;
for (ai = firstai; ai != NULL; ai = ai->ai_next) {
struct addrlist *duplicate;
if (ai->ai_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
src = &(sin->sin_addr);
@ -307,7 +309,14 @@ struct addrlist *get_address_info (
family = FamilyInternet6;
}
if (len > 0 && src != NULL) {
for(duplicate = retval; duplicate != NULL; duplicate = duplicate->next) {
if(duplicate->family == family && duplicate->len == len &&
memcmp(duplicate->address, src, len) == 0) {
break;
}
}
if (len > 0 && src != NULL && duplicate == NULL) {
struct addrlist *newrv = malloc (sizeof(struct addrlist));
if (newrv) {
newrv->address = malloc (len);

5
app/xauth/process.c
View File

@ -484,6 +484,9 @@ get_displayname_auth(char *displayname, AuthList **authl)
cp = strchr(displayname, '/');
if (cp && strncmp (cp, "/unix:", 6) == 0)
prelen = (cp - displayname);
if (strncmp (displayname, "/tmp/launch", 11) == 0)
displayname = strrchr(displayname, '/') + 1;
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
&family, &host, &dpynum, &scrnum, &rest)) {
@ -957,7 +960,7 @@ fprintfhex(register FILE *fp, int len, char *cp)
char *hex;
hex = bintohex(len, cp);
fprintf(fp, hex);
fprintf(fp, "%s", hex);
free(hex);
}