[GNUnet-SVN] r28521 - msh/src

[gnunet]

Author: harsha
Date: 2013-08-12 15:22:54 +0200 (Mon, 12 Aug 2013)
New Revision: 28521

Modified:
   msh/src/msh.c
   msh/src/mshd-server.c
   msh/src/mshd.c
Log:
- fixes


Modified: msh/src/msh.c
===================================================================
--- msh/src/msh.c       2013-08-12 12:47:21 UTC (rev 28520)
+++ msh/src/msh.c       2013-08-12 13:22:54 UTC (rev 28521)
@@ -676,6 +676,7 @@
     LOG_ERROR ("Could not find socket for local MSHD.  Are we running under 
MSHD?\n");
     return;
   }
+  LOG_DEBUG ("Unix socket path: %s\n", psock_path);
   ctx_local.cfg = GNUNET_CONFIGURATION_dup (cfg_);
   GNUNET_CONFIGURATION_set_value_string (ctx_local.cfg, MSHD_LOCAL,
                                          "UNIXPATH", psock_path);

Modified: msh/src/mshd-server.c
===================================================================
--- msh/src/mshd-server.c       2013-08-12 12:47:21 UTC (rev 28520)
+++ msh/src/mshd-server.c       2013-08-12 13:22:54 UTC (rev 28521)
@@ -507,9 +507,13 @@
 
   our_uid = getuid ();
   our_gid = getgid ();
-  (void) unlink (unixpath);
   saddr.sun_family = AF_UNIX;
-  (void) strcpy (saddr.sun_path, unixpath);
+  (void) memset (saddr.sun_path, 0, sizeof (saddr.sun_path));
+  (void) strncpy (saddr.sun_path, unixpath, sizeof (saddr.sun_path));
+  saddr.sun_path [sizeof (saddr.sun_path) - 1] = '\0';
+#if LINUX
+  saddr.sun_path[0] = '\0';
+#endif
   local_serv = GNUNET_SERVER_create (&check_local_access, NULL,
                                      saddrs,
                                      saddr_lens,

Modified: msh/src/mshd.c
===================================================================
--- msh/src/mshd.c      2013-08-12 12:47:21 UTC (rev 28520)
+++ msh/src/mshd.c      2013-08-12 13:22:54 UTC (rev 28521)
@@ -472,6 +472,7 @@
   GNUNET_assert (NULL != dtemp);
   GNUNET_assert (0 < asprintf (&unixpath, "%s/%ju.sock", dtemp, pid));
   GNUNET_free (dtemp);
+  setenv (MSHD_SOCK_NAME, unixpath, 1);
   init_local_server (unixpath);
   init_daemon_server (listen_socket);
   listen_socket = NULL;
@@ -480,9 +481,8 @@
                                                 &do_shutdown, NULL);
   if (0 == rank)
   {
-    setenv (MSHD_SOCK_NAME, unixpath, 1);
     proc = GNUNET_OS_start_process_vap (GNUNET_NO,
-                                        GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                        GNUNET_OS_INHERIT_STD_ALL,
                                         NULL,
                                         NULL,
                                         run_args[0],