diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:24:18 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-03-02 11:24:18 +0100 |
| commit | 9d41e84ea9baf215c6de11224dc2597cd37359dc (patch) | |
| tree | 0b1ace237a54d171c83cb79750af11a050a99fdd | |
| parent | 554a6fa760de47c497abcc91bb5f1f9b2756a407 (diff) | |
| parent | ce037f4e3c15c7cbc50adb02f6027a4d37c0ab90 (diff) | |
| download | nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.tar.gz nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.tar.bz2 nx-libs-9d41e84ea9baf215c6de11224dc2597cd37359dc.zip | |
Merge branch 'sunweaver-pr/allow-empty-nx-options-string' into 3.6.x
Attributes GH PR #314: https://github.com/ArcticaProject/nx-libs/pull/314
Fixes: ArcticaProject/nx-libs#51.
| -rw-r--r-- | nxcomp/Loop.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index 86c951a06..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 '" @@ -9138,7 +9139,7 @@ int ParseEnvironmentOptions(const char *env, int force) << env << "'.\n" << logofs_flush; #endif - if (*fileOptions != '\0') + if ((*fileOptions != '\0') && (strncmp(fileOptions, "/dev/", 5) != 0) && (strncmp(fileOptions, "/proc/", 6) != 0) && (strncmp(fileOptions, "/sys/", 5) != 0)) { if (strcmp(fileOptions, optionsFileName) != 0) { |