diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-15 16:17:47 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-15 16:17:47 +0000 |
| commit | e3d4674a3f7364cf4c2b869491848de2df3fd6f1 (patch) | |
| tree | 4d0459e2c09cf2febdfda76582c39f1959bd285c /app | |
| parent | 1a72ea415fd4105f62914caf8effd74a356da8c8 (diff) | |
Pass '-nolisten tcp' option to Xserver so that it doesn't listen
on port 6000 by default anymore.
ok jasper@, ajacoutot@, naddy@, phessler@
Diffstat (limited to 'app')
| -rw-r--r-- | app/xdm/config/Xservers.ws.cpp | 2 | ||||
| -rw-r--r-- | app/xinit/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | app/xinit/openbsd/xserverrc | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/xdm/config/Xservers.ws.cpp b/app/xdm/config/Xservers.ws.cpp index b6089ef5e..24cfa9a8d 100644 --- a/app/xdm/config/Xservers.ws.cpp +++ b/app/xdm/config/Xservers.ws.cpp @@ -9,4 +9,4 @@ XCOMM you can add them here as well. Each X terminal line should XCOMM look like: XCOMM XTerminalName:0 foreign XCOMM -:0 local BINDIR/X :0 DEFAULTVT +:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp diff --git a/app/xinit/Makefile.bsd-wrapper b/app/xinit/Makefile.bsd-wrapper index 44678bf4d..6e181b485 100644 --- a/app/xinit/Makefile.bsd-wrapper +++ b/app/xinit/Makefile.bsd-wrapper @@ -1,3 +1,7 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2013/09/14 09:16:23 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2015/06/15 16:17:46 matthieu Exp $ + +afterinstall: + $(INSTALL) -m 644 ${.CURDIR}/openbsd/xserverrc \ + $(DESTDIR)/etc/X11/xinit .include <bsd.xorg.mk> diff --git a/app/xinit/openbsd/xserverrc b/app/xinit/openbsd/xserverrc new file mode 100644 index 000000000..8c1e13822 --- /dev/null +++ b/app/xinit/openbsd/xserverrc @@ -0,0 +1,3 @@ +#! /bin/sh +# $OpenBSD: xserverrc,v 1.1 2015/06/15 16:17:46 matthieu Exp $ +exec /usr/X11R6/bin/X -nolisten tcp "$@" |