Changeset 6505

Timestamp:

Aug 29, 2016 6:05:41 PM (7 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

nanoscale/branches/1.0

Files:

• . (modified) (1 prop)
• aclocal.m4 (modified) (1 prop)
• cf (modified) (1 prop)
• configure.ac (modified) (1 prop)
• renderservers.tcl.in (modified) (1 diff)
• server.c (modified) (2 diffs)
• start_nanoscale.sh.in (modified) (1 prop)

nanoscale/branches/1.0/renderservers.tcl.in

@@ -134 +134 @@
     MSMSSERVER ${libdir}/vmd/msms
     STRIDE_BIN ${libdir}/vmd/stride
-    LD_LIBRARY_PATH ${libdir}
+    LD_LIBRARY_PATH ""
     __GL_SYNC_TO_VBLANK 0
 }

nanoscale/branches/1.0/server.c

@@ -308 +308 @@
     f = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
     if (f < 0) {
-        Tcl_AppendResult(interp, "can't create listerner socket for \"",
+        Tcl_AppendResult(interp, "can't create listener socket for \"",
                 serverPtr->name, "\": ", Tcl_PosixError(interp), (char *)NULL);
         goto error;
@@ -606 +606 @@
                     }
                 }
+                /* Make sure to close syslog in case it is using one of
+                 * the file descriptors we are about to close
+                 */
+                closelog();
                 /* Dup the socket to descriptors, e.g. 3 and 4 */
                 if (dup2(sock, serverPtr->inputFd) < 0)  { /* input */