diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2017-03-15 14:56:17 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-21 10:58:08 +0100 |
| commit | e8bc4c7e2f42d21e41328b68d5dc2a15db73d47a (patch) | |
| tree | d767bfc45dda8a67c83d1d11ca243d1c901ea596 /nx-X11/programs/Xserver/os/utils.c | |
| parent | 89496d987dc6a21250c9fdda2cd3668516061f5c (diff) | |
| download | nx-libs-e8bc4c7e2f42d21e41328b68d5dc2a15db73d47a.tar.gz nx-libs-e8bc4c7e2f42d21e41328b68d5dc2a15db73d47a.tar.bz2 nx-libs-e8bc4c7e2f42d21e41328b68d5dc2a15db73d47a.zip | |
os: Add a mechanism to prevent creating any listen sockets
commit 44fe1b8ea284df6bbaef67e246016d104665b2fe
Author: Kristian Høgsberg <krh@bitplanet.net>
Date: Wed Mar 19 14:03:13 2014 -0700
os: Add a mechanism to prevent creating any listen sockets
A socket-activated server will receive its listening sockets from the
parent process and should not create its own sockets. This patch
introduces a NoListen flag that can be set by a DDX to prevent
the server from creating the sockets. When NoListen is enabled, we
also disable the server lock checking, since the parent process is
responsible for checking the lock before picking the display name and
creating the sockets.
Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver/os/utils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 929549168..74acb53ef 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -338,7 +338,7 @@ LockServer(void) int len; char port[20]; - if (nolock) return; + if (nolock || NoListenAll) return; /* * Path names */ @@ -464,7 +464,7 @@ LockServer(void) void UnlockServer(void) { - if (nolock) return; + if (nolock || NoListenAll) return; if (!StillLocking){ |