From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 1 Jul 2010 15:42:51 +0000 (+0000)
Subject: unlink on bind
X-Git-Tag: initial-import-from-subversion-38251~21099
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dc196695653457ad6dace5de527f2d556eb76d7d;p=oweals%2Fgnunet.git

unlink on bind
---

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;