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.

Merge branch 'sunweaver-pr/allow-empty-nx-options-string' into 3.6.x
9d41e84e · Mihai Moldovan · 554a6fa7 · ce037f4e · 9d41e84e
Unverified Commit 9d41e84e authored Mar 02, 2017 by Mihai Moldovan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Loop.cpp nxcomp/Loop.cpp +3 -2

No files found.
--- 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)
    {