diff options
author | anholt <anholt@FreeBSD.org> | 2004-07-06 08:53:26 +0800 |
---|---|---|
committer | anholt <anholt@FreeBSD.org> | 2004-07-06 08:53:26 +0800 |
commit | 8efae78fc56cb8f21e32c08b00f3ca40025664e9 (patch) | |
tree | eab21ed45be6d63dd14e84ca23d961142261fce1 /x11 | |
parent | e462e81613659b39e126364fad56d9f4b9a437b3 (diff) | |
download | freebsd-ports-gnome-8efae78fc56cb8f21e32c08b00f3ca40025664e9.tar.gz freebsd-ports-gnome-8efae78fc56cb8f21e32c08b00f3ca40025664e9.tar.zst freebsd-ports-gnome-8efae78fc56cb8f21e32c08b00f3ca40025664e9.zip |
Add fix for VuXML ID: ff00f2ce-c54c-11d8-b708-00061bc2ad93
When the IPv6 code was added to xdm a critical test to disable xdmcp was
accidentally removed. This caused xdm to create the chooser socket regardless
if DisplayManager.requestPort was disabled in xdm-config or not.
Prodded by: Dejan Lesjak
Obtained from: XFree86 bugzilla / X.Org CVS
Diffstat (limited to 'x11')
-rw-r--r-- | x11/xorg-clients/Makefile | 1 | ||||
-rw-r--r-- | x11/xorg-clients/files/patch-xdm-socket.c | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 6792c1cc054f..67ee40bd427f 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -7,6 +7,7 @@ PORTNAME= xorg-clients PORTVERSION= 6.7.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ DISTFILES= X11R6.7.0-src1.tar.gz \ diff --git a/x11/xorg-clients/files/patch-xdm-socket.c b/x11/xorg-clients/files/patch-xdm-socket.c new file mode 100644 index 000000000000..01c00e51e607 --- /dev/null +++ b/x11/xorg-clients/files/patch-xdm-socket.c @@ -0,0 +1,17 @@ +Index: programs/xdm/socket.c +=================================================================== +RCS file: /cvs/xorg/xc/programs/xdm/socket.c,v +retrieving revision 1.2 +diff -u -r1.2 socket.c +--- programs/xdm/socket.c 23 Apr 2004 19:54:42 -0000 1.2 ++++ programs/xdm/socket.c 6 Jul 2004 00:28:43 -0000 +@@ -67,6 +67,9 @@ + char *name = localHostname (); + registerHostname (name, strlen (name)); + ++ if (request_port == 0) ++ return; ++ + #if defined(IPv6) && defined(AF_INET6) + chooserFd = socket (AF_INET6, SOCK_STREAM, 0); + if (chooserFd == -1) |