X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Fnetwork.c;h=101e794d07c892827182455620e7d30dec5f2b88;hb=555214089c7045298f23fea9e060ea931804e75f;hp=37e40aa1a2244ec1d7b88f895c9d0684c99d9ca5;hpb=37194f115116b2ea38d5ccb3c7fd8d3a75d77641;p=oweals%2Fgnunet.git

diff --git a/src/util/network.c b/src/util/network.c
index 37e40aa1a..101e794d0 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -41,14 +41,6 @@ struct GNUNET_NETWORK_Handle
 #ifndef MINGW
   int fd;
 
-#ifndef LINUX
-  /**
-   * For UNIX domain listen sockets, underlying filename to be removed
-   * on close.
-   */
-  char *filename;
-#endif
-
 #else
   SOCKET fd;
 #endif
@@ -273,7 +265,10 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
   if ( (ret == 0) && (address->sa_family == AF_UNIX))
     {
       const struct sockaddr_un *un = (const struct sockaddr_un*) address;
-      desc->filename = GNUNET_strdup (un->sun_path);
+      if (0 != unlink (un->sun_path))
+	GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+				  "unlink",
+				  un->sun_path);
     }
 #endif
 #endif
@@ -296,16 +291,6 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
   SetErrnoFromWinsockError (WSAGetLastError ());
 #else
   ret = close (desc->fd);
-#ifndef LINUX
-  if (NULL != desc->filename)
-    {
-      if (0 != unlink (desc->filename))
-	GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-				  "unlink",
-				  desc->filename);
-      GNUNET_free (desc->filename);
-    }
-#endif
 #endif
   GNUNET_free (desc);
   return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;