aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-02-05 12:47:57 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-02 11:19:59 +0100
commitce037f4e3c15c7cbc50adb02f6027a4d37c0ab90 (patch)
tree0b1ace237a54d171c83cb79750af11a050a99fdd
parenta4be1b89ff0929b6b801efa9afd996010d7dd075 (diff)
downloadnx-libs-ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90.tar.gz
nx-libs-ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90.tar.bz2
nx-libs-ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90.zip
nxcomp/Loop.cpp: Allow nx/nx:<disp> as DISPLAY variable (i.e. an empty nx/nx options string.
-rw-r--r--nxcomp/Loop.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp
index b795c62af..3710b6414 100644
--- a/nxcomp/Loop.cpp
+++ b/nxcomp/Loop.cpp
@@ -4069,7 +4069,8 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
}
else if (strncasecmp(display, "nx/nx,", 6) == 0 ||
strncasecmp(display, "nx,", 3) == 0 ||
- strncasecmp(display, "nx:", 3) == 0)
+ strncasecmp(display, "nx/nx:", 6) == 0 ||
+ strncasecmp(display, "nx:", 3) == 0)
{
#ifdef PANIC
*logofs << "Loop: PANIC! NX transport on host X server '"