diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-03-19 21:19:58 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2019-03-19 21:19:58 +0000 |
| commit | 20cdf7268f0006bb9ffa593ffd2235295b561f51 (patch) | |
| tree | d931fee6ce2111c6a9a875a00ea0a035dd95e41e /xserver/os | |
| parent | c5e7388ec138dcbf9c68c208cb4764841a0208be (diff) | |
Update to xserver 1.19.7. Tested by jca@ and stsp@.
Diffstat (limited to 'xserver/os')
| -rw-r--r-- | xserver/os/inputthread.c | 1 | ||||
| -rw-r--r-- | xserver/os/xdmcp.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xserver/os/inputthread.c b/xserver/os/inputthread.c index 721e86312..dc4eb9f20 100644 --- a/xserver/os/inputthread.c +++ b/xserver/os/inputthread.c @@ -497,6 +497,7 @@ InputThreadFini(void) /* Close the pipe to get the input thread to shut down */ close(hotplugPipeWrite); + input_force_unlock(); pthread_join(inputThreadInfo->thread, NULL); xorg_list_for_each_entry_safe(dev, next, &inputThreadInfo->devs, node) { diff --git a/xserver/os/xdmcp.c b/xserver/os/xdmcp.c index 7aeb393e6..d8c81fbf8 100644 --- a/xserver/os/xdmcp.c +++ b/xserver/os/xdmcp.c @@ -486,7 +486,7 @@ XdmcpRegisterConnection(int type, const char *address, int addrlen) IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) address)) { fromAddr = &((struct sockaddr_in *) &FromAddress)->sin_addr; regAddr = - &((struct sockaddr_in6 *) &address)->sin6_addr.s6_addr[12]; + &((struct sockaddr_in6 *) address)->sin6_addr.s6_addr[12]; regAddrlen = sizeof(struct in_addr); } } |