andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

os/xdmcp: Fix binding of ipv6 source address

Browse Source 
Choose the socket fd of the correct address family based
on the address family of the argument to the -from option.

Fixes: xorg/xserver#4
This commit is contained in:
Andreas Fett 2018-10-22 22:03:22 +02:00 committed by Adam Jackson
parent 96e00730e7
commit 08ff37d05a
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
os/xdmcp.c
View File

@ -912,6 +912,7 @@ static void
get_xdmcp_sock(void)
{
int soopts = 1;
int socketfd = -1;
#if defined(IPv6) && defined(AF_INET6)
if ((xdmcpSocket6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
@ -924,8 +925,18 @@ get_xdmcp_sock(void)
sizeof(soopts)) < 0)
XdmcpWarning("UDP set broadcast socket-option failed");
#endif /* SO_BROADCAST */
if (xdmcpSocket >= 0 && xdm_from != NULL) {
if (bind(xdmcpSocket, (struct sockaddr *) &FromAddress,
if (xdm_from == NULL)
return;
if (SOCKADDR_FAMILY(FromAddress) == AF_INET)
socketfd = xdmcpSocket;
#if defined(IPv6) && defined(AF_INET6)
else if (SOCKADDR_FAMILY(FromAddress) == AF_INET6)
socketfd = xdmcpSocket6;
#endif
if (socketfd >= 0) {
if (bind(socketfd, (struct sockaddr *) &FromAddress,
FromAddressLen) < 0) {
FatalError("Xserver: failed to bind to -from address: %s\n",
xdm_from);