Skip to content

N
nx-libs
Unverified Commit 9d41e84e authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

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.
parents 554a6fa7 ce037f4e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
nxcomp/Loop.cpp
View file @ 9d41e84e
...@@ -4069,6 +4069,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr, ...@@ -4069,6 +4069,7 @@ int SetupDisplaySocket(int &xServerAddrFamily, sockaddr *&xServerAddr,
} }
else if (strncasecmp(display, "nx/nx,", 6) == 0 || 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) strncasecmp(display, "nx:", 3) == 0)
{ {
#ifdef PANIC #ifdef PANIC
...@@ -9138,7 +9139,7 @@ int ParseEnvironmentOptions(const char *env, int force) ...@@ -9138,7 +9139,7 @@ int ParseEnvironmentOptions(const char *env, int force)
<< env << "'.\n" << logofs_flush; << env << "'.\n" << logofs_flush;
#endif #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) if (strcmp(fileOptions, optionsFileName) != 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment