diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-15 15:00:27 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-21 10:58:08 +0100 |
| commit | 506aedbcd3f56cf255b397f1e586f16f97e3619a (patch) | |
| tree | a8a3bc57d70b1748a816e5779ffe527881cbfebd | |
| parent | e8bc4c7e2f42d21e41328b68d5dc2a15db73d47a (diff) | |
| download | nx-libs-506aedbcd3f56cf255b397f1e586f16f97e3619a.tar.gz nx-libs-506aedbcd3f56cf255b397f1e586f16f97e3619a.tar.bz2 nx-libs-506aedbcd3f56cf255b397f1e586f16f97e3619a.zip | |
Xserver/os/utils.c: Add NXAGENT_SERVER specific -nolisten parameter: ANY.
This allows us to trigger the NoListenAll := TRUE code path in nxagent.
| -rw-r--r-- | nx-X11/programs/Xserver/os/Imakefile | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 86f5cd4e6..7932e32cd 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -43,6 +43,7 @@ NX_DEFINES = -DNX_TRANS_SOCKET \ -DNX_TRANS_SLEEP \ -DNX_TRANS_EXIT \ -DNX_TRANS_WAKEUP=1000 \ + -DNXAGENT_SERVER \ $(NULL) # -DNX_TRANS_WARN \ diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c index 74acb53ef..dce04e942 100644 --- a/nx-X11/programs/Xserver/os/utils.c +++ b/nx-X11/programs/Xserver/os/utils.c @@ -902,6 +902,11 @@ ProcessCommandLine(int argc, char *argv[]) else if ( strcmp( argv[i], "-nolisten") == 0) { if(++i < argc) { +#ifdef NXAGENT_SERVER + if (strcmp( argv[i], "ANY" ) == 0) + NoListenAll = TRUE; + else +#endif /* NXAGENT_SERVER */ if (_XSERVTransNoListen(argv[i])) FatalError ("Failed to disable listen for %s transport", argv[i]); |