Changeset 6622 for nanoscale/branches/1.0/server.c

Timestamp:

Nov 14, 2016, 12:25:18 PM (8 years ago)

Author:

ldelgass

Message:

Merge fixes from nanoscale trunk (minus the config parser changes)

Location:

nanoscale/branches/1.0

Files:

• . (modified) (1 prop)
• server.c (modified) (2 diffs)

nanoscale/branches/1.0/server.c

@@ -548 +548 @@
                         serverPtr->name, getpid());
                     if (serverPtr->logStdout) {
-                        newFd = open(path, O_WRONLY | O_CREAT| O_TRUNC, 0600);
+                        newFd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
                     } else {
                         newFd = open("/dev/null", O_WRONLY, 0600);
@@ -639 +639 @@
                 display[3] = screenNum + '0';
                 setenv("DISPLAY", display, 1);
-                /* Set the enviroment, if necessary. */
+                /* Don't pollute child's environment with our library path.
+                 * Library path should be explicitly set in config if needed.
+                 */ 
+                unsetenv("LD_LIBRARY_PATH");
+                /* Set the configured environment */
                 for (i = 0; i < serverPtr->numEnvArgs; i += 2) {
                     setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 1);