20 files changed, 121 insertions, 181 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 1196b20aa..942534b08 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -622,8 +622,8 @@ create_listen_socket (struct sockaddr *sa, socklen_t addr_len,
                         "setsockopt");
 #endif
-  if (GNUNET_NETWORK_socket_bind
+  if (GNUNET_OK !=
-      (sock, (const struct sockaddr *) sa, addr_len, 0) != GNUNET_OK)
+      GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) sa, addr_len))
    {
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                  _
diff --git a/src/dns/dnsstub.c b/src/dns/dnsstub.c
index bd85bf896..e494d24a2 100644
--- a/src/dns/dnsstub.c
+++ b/src/dns/dnsstub.c
@@ -169,8 +169,7 @@ open_socket (int af)
  sa->sa_family = af;
  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (ret,
                                               sa,
-                                               alen,
+                                               alen))
-                                               0))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("Could not bind to any port: %s\n"),
@@ -446,7 +445,7 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs,
    if ( (addrlen != rs->addrlen) ||
         (0 != memcmp (&rs->addr,
                       &addr,
-                       addrlen)) ||     
+                       addrlen)) ||
       (0 == GNUNET_TIME_absolute_get_remaining (rs->timeout).rel_value_us) )
    {
      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 4dcec6bdc..42d5ef0e2 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -616,8 +616,7 @@ run_dnsd ()
      if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (listen_socket4,
                                      (struct sockaddr *) &v4,
-                                      sizeof (v4),
+                                      sizeof (v4)))
-                                      0))
        {
          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
          GNUNET_NETWORK_socket_close (listen_socket4);
@@ -640,8 +639,7 @@ run_dnsd ()
      if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (listen_socket6,
                                      (struct sockaddr *) &v6,
-                                      sizeof (v6),
+                                      sizeof (v6)))
-                                      0))
        {
          GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
          GNUNET_NETWORK_socket_close (listen_socket6);
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h
index d24019f1a..042ab235e 100644
--- a/src/include/gnunet_network_lib.h
+++ b/src/include/gnunet_network_lib.h
@@ -131,25 +131,17 @@ GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
 /**
- * Fail to bind if an address is already in use.
- */
-#define GNUNET_BIND_EXCLUSIVE 0x01
-/**
 * Bind a socket to a particular address.
 *
 * @param desc socket to bind
 * @param address address to be bound
 * @param address_len length of address
- * @param flags flags affecting bind behaviour
 * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
 */
 int
 GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                            const struct sockaddr *address,
-                            socklen_t address_len,
+                            socklen_t address_len);
-                            int flags);
 /**
 * Close a socket.
diff --git a/src/nat/nat_test.c b/src/nat/nat_test.c
index 0c1d59a87..387a68d8f 100644
--- a/src/nat/nat_test.c
+++ b/src/nat/nat_test.c
@@ -404,7 +404,7 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
    if ((ret->lsock == NULL) ||
        (GNUNET_OK !=
         GNUNET_NETWORK_socket_bind (ret->lsock, (const struct sockaddr *) &sa,
-                                     sizeof (sa), 0)))
+                                     sizeof (sa))))
    {
      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                  _
diff --git a/src/testing/testing.c b/src/testing/testing.c
index a0d8e261b..4e60ae0f7 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -627,8 +627,7 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system)
          continue;
        bind_status = GNUNET_NETWORK_socket_bind (socket,
                                                  ai->ai_addr,
-                                                  ai->ai_addrlen,
+                                                  ai->ai_addrlen);
-                                                  0);
        GNUNET_NETWORK_socket_close (socket);
        if (GNUNET_OK != bind_status)
          break;
@@ -637,8 +636,7 @@ GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system)
          continue;
        bind_status = GNUNET_NETWORK_socket_bind (socket,
                                                  ai->ai_addr,
-                                                  ai->ai_addrlen,
+                                                  ai->ai_addrlen);
-                                                  0);
        GNUNET_NETWORK_socket_close (socket);
        if (GNUNET_OK != bind_status)
          break;
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 343aacd19..9d5318663 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -1070,6 +1070,7 @@ read_from_the_socket (void *sock,
  return count;
 }
 /**
 * Open the bluetooth interface for reading/writing
 *
@@ -1087,7 +1088,8 @@ open_device (struct HardwareInfos *dev)
    addr.btAddr = 0;
    addr.port = BT_PORT_ANY;
-    if (GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof (SOCKADDR_BTH), 0) != GNUNET_OK)
+    if (GNUNET_OK != 
+        GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof (SOCKADDR_BTH)))
    {
      fprintf (stderr, "Failed to bind the socket: ");
      if (GetLastError() == WSAENETDOWN)
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 043633ab1..317454e83 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -2798,7 +2798,7 @@ setup_sockets (struct Plugin *plugin,
                                 GNUNET_a2s (serverAddr, addrlen));
                /* binding */
                if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
-                                                             serverAddr, addrlen, 0))
+                                                             serverAddr, addrlen))
                        break;
                eno = errno;
                if (0 != plugin->port)
@@ -2875,7 +2875,7 @@ setup_sockets (struct Plugin *plugin,
      /* binding */
      if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
-                                                   serverAddr, addrlen, 0))
+                                                   serverAddr, addrlen))
                break;
      eno = errno;
      if (0 != plugin->port)
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index e80102a33..e78445a0a 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -348,6 +348,7 @@ reschedule_session_timeout (struct Session *s);
 static void
 unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 /**
 * Function called for a quick conversion of the binary address to
 * a numeric address.  Note that the caller must not free the
@@ -360,10 +361,47 @@ unix_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
 * @return string representing the same address
 */
 static const char *
-unix_address_to_string (void *cls, const void *addr, size_t addrlen);
+unix_address_to_string (void *cls, const void *addr, size_t addrlen)
+{
+  static char rbuf[1024];
+  struct UnixAddress *ua = (struct UnixAddress *) addr;
+  char *addrstr;
+  size_t addr_str_len;
+  if ((NULL == addr) || (sizeof (struct UnixAddress) > addrlen))
+  {
+    GNUNET_break(0);
+    return NULL ;
+  }
+  addrstr = (char *) &ua[1];
+  addr_str_len = ntohl (ua->addrlen);
+  if (addr_str_len != addrlen - sizeof(struct UnixAddress))
+  {
+    GNUNET_break(0);
+    return NULL ;
+  }
+  if ('\0' != addrstr[addr_str_len - 1])
+  {
+    GNUNET_break(0);
+    return NULL ;
+  }
+  if (strlen (addrstr) + 1 != addr_str_len)
+  {
+    GNUNET_break(0);
+    return NULL ;
+  }
+  GNUNET_snprintf (rbuf, sizeof(rbuf), "%s.%u.%s", PLUGIN_NAME,
+      ntohl (ua->options), addrstr);
+  return rbuf;
+}
 static struct sockaddr_un *
-unix_address_to_sockaddr (const char *unixpath , socklen_t *sock_len)
+unix_address_to_sockaddr (const char *unixpath,
+                          socklen_t *sock_len)
 {
  struct sockaddr_un *un;
  size_t slen;
@@ -380,14 +418,11 @@ unix_address_to_sockaddr (const char *unixpath , socklen_t *sock_len)
 #if HAVE_SOCKADDR_IN_SIN_LEN
  un->sun_len = (u_char) slen;
 #endif
-#if LINUX
-  un->sun_path[0] = '\0';
-#endif
  (*sock_len) = slen;
  return un;
 }
 /**
 * Re-schedule the main 'select' callback (unix_plugin_select)
 * for this plugin.
@@ -426,7 +461,7 @@ reschedule_select (struct Plugin * plugin)
 /**
- * Closure to 'lookup_session_it'.
+ * Closure to #lookup_session_it.
 */
 struct LookupCtx
 {
@@ -440,6 +475,9 @@ struct LookupCtx
   */
  const struct UnixAddress *ua;
+  /**
+   * Number of bytes in @e ua
+   */
  size_t ua_len;
 };
@@ -450,7 +488,7 @@ struct LookupCtx
 * @param cls the 'struct LookupCtx'
 * @param key peer we are looking for (unused)
 * @param value a session
- * @return GNUNET_YES if not found (continue looking), GNUNET_NO on success
+ * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
 */
 static int
 lookup_session_it (void *cls,
@@ -462,7 +500,7 @@ lookup_session_it (void *cls,
  if (t->addrlen != lctx->ua_len)
  {
-        GNUNET_break (0);
+    GNUNET_break (0);
    return GNUNET_YES;
  }
@@ -708,7 +746,7 @@ struct GetSessionIteratorContext
 * @param cls the 'struct LookupCtx'
 * @param key peer we are looking for (unused)
 * @param value a session
- * @return GNUNET_YES if not found (continue looking), GNUNET_NO on success
+ * @return #GNUNET_YES if not found (continue looking), #GNUNET_NO on success
 */
 static int
 get_session_it (void *cls,
@@ -755,7 +793,7 @@ session_timeout (void *cls,
 *
 * @param cls closure ('struct Plugin*')
 * @param session the session
- * @return the network type in HBO or GNUNET_SYSERR
+ * @return the network type in HBO or #GNUNET_SYSERR
 */
 static enum GNUNET_ATS_Network_Type
 unix_get_network (void *cls,
@@ -952,7 +990,7 @@ unix_plugin_send (void *cls,
 * @param sender from which peer the message was received
 * @param currhdr pointer to the header of the message
 * @param ua address to look for
- * @param ua_len length of the address
+ * @param ua_len length of the address @a ua
 */
 static void
 unix_demultiplexer (struct Plugin *plugin, struct GNUNET_PeerIdentity *sender,
@@ -1041,19 +1079,18 @@ unix_plugin_select_read (struct Plugin *plugin)
  }
  else
  {
-#if LINUX
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
-    un.sun_path[0] = '/';
+         "Read %d bytes from socket %s\n",
-#endif
+         (int) ret,
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
+         un.sun_path);
-                &un.sun_path[0]);
  }
  GNUNET_assert (AF_UNIX == (un.sun_family));
-  ua_len = sizeof (struct UnixAddress) + strlen (&un.sun_path[0]) +1;
+  ua_len = sizeof (struct UnixAddress) + strlen (un.sun_path) + 1;
  ua = GNUNET_malloc (ua_len);
  ua->addrlen = htonl (strlen (&un.sun_path[0]) +1);
  ua->options = htonl (0);
-  memcpy (&ua[1], &un.sun_path[0], strlen (&un.sun_path[0]) +1);
+  memcpy (&ua[1], &un.sun_path[0], strlen (un.sun_path) + 1);
  msg = (struct UNIXMessage *) buf;
  csize = ntohs (msg->header.size);
@@ -1232,7 +1269,7 @@ unix_plugin_select (void *cls,
 * Create a slew of UNIX sockets.  If possible, use IPv6 and IPv4.
 *
 * @param cls closure for server start, should be a struct Plugin *
- * @return number of sockets created or GNUNET_SYSERR on error
+ * @return number of sockets created or #GNUNET_SYSERR on error
 */
 static int
 unix_transport_server_start (void *cls)
@@ -1250,8 +1287,8 @@ unix_transport_server_start (void *cls)
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
    return GNUNET_SYSERR;
  }
-  if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, (const struct sockaddr *)  un, un_len, 0)
+  if (GNUNET_OK !=
-      != GNUNET_OK)
+      GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, (const struct sockaddr *)  un, un_len))
  {
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
    GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
@@ -1274,55 +1311,6 @@ unix_transport_server_start (void *cls)
 /**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param cls closure
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
-static const char *
-unix_address_to_string (void *cls, const void *addr, size_t addrlen)
-{
-  static char rbuf[1024];
-  struct UnixAddress *ua = (struct UnixAddress *) addr;
-  char *addrstr;
-  size_t addr_str_len;
-  if ((NULL == addr) || (sizeof (struct UnixAddress) > addrlen))
-  {
-    GNUNET_break(0);
-    return NULL ;
-  }
-  addrstr = (char *) &ua[1];
-  addr_str_len = ntohl (ua->addrlen);
-  if (addr_str_len != addrlen - sizeof(struct UnixAddress))
-  {
-    GNUNET_break(0);
-    return NULL ;
-  }
-  if ('\0' != addrstr[addr_str_len - 1])
-  {
-    GNUNET_break(0);
-    return NULL ;
-  }
-  if (strlen (addrstr) + 1 != addr_str_len)
-  {
-    GNUNET_break(0);
-    return NULL ;
-  }
-  GNUNET_snprintf (rbuf, sizeof(rbuf), "%s.%u.%s", PLUGIN_NAME,
-      ntohl (ua->options), addrstr);
-  return rbuf;
-}
-/**
 * Function that will be called to check if a binary address for this
 * plugin is well-formed and corresponds to an address for THIS peer
 * (as per our configuration).  Naturally, if absolutely necessary,
@@ -1425,7 +1413,7 @@ static int
 unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
    void **buf, size_t *added)
 {
-        struct UnixAddress *ua;
+  struct UnixAddress *ua;
  char *address;
  char *plugin;
  char *optionstr;
@@ -1461,7 +1449,7 @@ unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
    return GNUNET_SYSERR;
  }
  optionstr[0] = '\0';
-  optionstr ++;
+  optionstr++;
  options = atol (optionstr);
  address = strchr (optionstr, '.');
  if (NULL == address)
@@ -1471,7 +1459,7 @@ unix_string_to_address (void *cls, const char *addr, uint16_t addrlen,
    return GNUNET_SYSERR;
  }
  address[0] = '\0';
-  address ++;
+  address++;
  if (0 != strcmp(plugin, PLUGIN_NAME))
  {
    GNUNET_break (0);
diff --git a/src/util/client.c b/src/util/client.c
index 0e8804158..825c8ec52 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -829,11 +829,12 @@ GNUNET_CLIENT_service_test (const char *service,
  {
    /* probe UNIX support */
    struct sockaddr_un s_un;
-    size_t slen;
    char *unixpath;
    unixpath = NULL;
-    if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, service, "UNIXPATH", &unixpath)) && (0 < strlen (unixpath)))  /* We have a non-NULL unixpath, does that mean it's valid? */
+    if ((GNUNET_OK == 
+         GNUNET_CONFIGURATION_get_value_filename (cfg, service, "UNIXPATH", &unixpath)) && 
+        (0 < strlen (unixpath)))  /* We have a non-NULL unixpath, does that mean it's valid? */
    {
      if (strlen (unixpath) >= sizeof (s_un.sun_path))
      {
@@ -852,21 +853,13 @@ GNUNET_CLIENT_service_test (const char *service,
      {
        memset (&s_un, 0, sizeof (s_un));
        s_un.sun_family = AF_UNIX;
-        slen = strlen (unixpath) + 1;
+        strncpy (s_un.sun_path, unixpath, sizeof (s_un.sun_path) - 1);
-        if (slen >= sizeof (s_un.sun_path))
-          slen = sizeof (s_un.sun_path) - 1;
-        memcpy (s_un.sun_path, unixpath, slen);
-        s_un.sun_path[slen] = '\0';
-        slen = sizeof (struct sockaddr_un);
-#if LINUX
-        s_un.sun_path[0] = '\0';
-#endif
 #if HAVE_SOCKADDR_IN_SIN_LEN
-        s_un.sun_len = (u_char) slen;
+        s_un.sun_len = (u_char) sizeof (struct sockaddr_un);
 #endif
        if (GNUNET_OK !=
            GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_un,
-                                        slen, GNUNET_BIND_EXCLUSIVE))
+                                        sizeof (struct sockaddr_un)))
        {
          /* failed to bind => service must be running */
          GNUNET_free (unixpath);
@@ -916,7 +909,7 @@ GNUNET_CLIENT_service_test (const char *service,
    {
      if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_in,
-                                      sizeof (s_in), GNUNET_BIND_EXCLUSIVE))
+                                      sizeof (s_in)))
      {
        /* failed to bind => service must be running */
        GNUNET_free (hostname);
@@ -949,7 +942,7 @@ GNUNET_CLIENT_service_test (const char *service,
    {
      if (GNUNET_OK !=
          GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_in6,
-                                      sizeof (s_in6), GNUNET_BIND_EXCLUSIVE))
+                                      sizeof (s_in6)))
      {
        /* failed to bind => service must be running */
        GNUNET_free (hostname);
diff --git a/src/util/configuration.c b/src/util/configuration.c
index d7076fac1..1e516b825 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -88,8 +88,8 @@ struct GNUNET_CONFIGURATION_Handle
  /**
   * Modification indication since last save
-   * GNUNET_NO if clean, GNUNET_YES if dirty,
+   * #GNUNET_NO if clean, #GNUNET_YES if dirty,
-   * GNUNET_SYSERR on error (i.e. last save failed)
+   * #GNUNET_SYSERR on error (i.e. last save failed)
   */
  int dirty;
@@ -142,10 +142,10 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg)
 * @param cfg configuration to update
 * @param mem the memory block of serialized configuration
 * @param size the size of the memory block
- * @param allow_inline set to GNUNET_YES if we recursively load configuration
+ * @param allow_inline set to #GNUNET_YES if we recursively load configuration
- *          from inlined configurations; GNUNET_NO if not and raise warnings
+ *          from inlined configurations; #GNUNET_NO if not and raise warnings
 *          when we come across them
- * @return GNUNET_OK on success, GNUNET_ERROR on error
+ * @return #GNUNET_OK on success, #GNUNET_ERROR on error
 */
 int
 GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
diff --git a/src/util/connection.c b/src/util/connection.c
index a429f2f7e..eeabebdf7 100644
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -826,22 +826,13 @@ GNUNET_CONNECTION_create_from_connect_to_unixpath (const struct
 #ifdef AF_UNIX
  struct GNUNET_CONNECTION_Handle *connection;
  struct sockaddr_un *un;
-  size_t slen;
  GNUNET_assert (0 < strlen (unixpath));        /* sanity check */
  un = GNUNET_new (struct sockaddr_un);
  un->sun_family = AF_UNIX;
-  slen = strlen (unixpath);
+  strncpy(un->sun_path, unixpath, sizeof(un->sun_path) - 1);
-  if (slen >= sizeof (un->sun_path))
-    slen = sizeof (un->sun_path) - 1;
-  memcpy (un->sun_path, unixpath, slen);
-  un->sun_path[slen] = '\0';
-  slen = sizeof (struct sockaddr_un);
 #if HAVE_SOCKADDR_IN_SIN_LEN
-  un->sun_len = (u_char) slen;
+  un->sun_len = (u_char) sizeof (struct sockaddr_un);
-#endif
-#if LINUX
-  un->sun_path[0] = '\0';
 #endif
  connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
  connection->cfg = cfg;
@@ -850,7 +841,7 @@ GNUNET_CONNECTION_create_from_connect_to_unixpath (const struct
  connection->port = 0;
  connection->hostname = NULL;
  connection->addr = (struct sockaddr *) un;
-  connection->addrlen = slen;
+  connection->addrlen = sizeof (struct sockaddr_un);
  connection->sock = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
  if (NULL == connection->sock)
  {
diff --git a/src/util/network.c b/src/util/network.c
index a921998e9..7a4b2a0b3 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -87,7 +87,9 @@ GNUNET_NETWORK_test_pf (int pf)
  {
    if (EAFNOSUPPORT == errno)
      return GNUNET_NO;
-    fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 
+                "Failed to create test socket: %s\n", 
+                STRERROR (errno));
    return GNUNET_SYSERR;
  }
 #if WINDOWS
@@ -383,20 +385,18 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
 * @param desc socket to bind
 * @param address address to be bound
 * @param address_len length of @a address
- * @param flags flags affecting bind behaviour
 * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
 */
 int
 GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
                            const struct sockaddr *address,
-                            socklen_t address_len,
+                            socklen_t address_len)
-                            int flags)
 {
  int ret;
  socklen_t bind_address_len = address_len;
 #ifdef LINUX
-  if (address->sa_family == AF_UNIX)
+  if (AF_UNIX == address->sa_family)
  {
    const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
    if (address_un->sun_path[0] == '\0')
@@ -431,16 +431,6 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
      LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
  }
 #endif
-#ifndef LINUX
-#ifndef MINGW
-  if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
-  {
-    const struct sockaddr_un *un = (const struct sockaddr_un *) address;
-    (void) unlink (un->sun_path);
-  }
-#endif
-#endif
  ret = bind (desc->fd, address, bind_address_len);
 #ifdef MINGW
  if (SOCKET_ERROR == ret)
@@ -449,12 +439,10 @@ GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
  if (ret != 0)
    return GNUNET_SYSERR;
 #ifndef MINGW
-#ifndef LINUX
  desc->addr = GNUNET_malloc (address_len);
  memcpy (desc->addr, address, address_len);
  desc->addrlen = address_len;
 #endif
-#endif
  return GNUNET_OK;
 }
@@ -483,17 +471,17 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 #else
  ret = close (desc->fd);
 #endif
-#ifndef LINUX
 #ifndef MINGW
  if ((desc->af == AF_UNIX) && (NULL != desc->addr))
  {
    const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr;
    if (0 != unlink (un->sun_path))
-      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", un->sun_path);
+      LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, 
+                         "unlink", 
+                         un->sun_path);
  }
 #endif
-#endif
  GNUNET_NETWORK_socket_free_memory_only_ (desc);
  return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
 }
diff --git a/src/util/server.c b/src/util/server.c
index e00b2ffb8..397e32f8c 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -468,7 +468,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
    return NULL;
  }
  /* bind the socket */
-  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen, 0))
+  if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen))
  {
    eno = errno;
    if (EADDRINUSE != errno)
diff --git a/src/util/service.c b/src/util/service.c
index eb3a84221..b8975f418 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -834,24 +834,15 @@ add_unixpath (struct sockaddr **saddrs, socklen_t * saddrlens,
 {
 #ifdef AF_UNIX
  struct sockaddr_un *un;
-  size_t slen;
  un = GNUNET_malloc (sizeof (struct sockaddr_un));
  un->sun_family = AF_UNIX;
-  slen = strlen (unixpath) + 1;
+  strncpy (un->sun_path, unixpath, sizeof (un->sun_path) - 1);
-  if (slen >= sizeof (un->sun_path))
-    slen = sizeof (un->sun_path) - 1;
-  memcpy (un->sun_path, unixpath, slen);
-  un->sun_path[slen] = '\0';
-  slen = sizeof (struct sockaddr_un);
-#if LINUX
-  un->sun_path[0] = '\0';
-#endif
 #if HAVE_SOCKADDR_IN_SIN_LEN
-  un->sun_len = (u_char) slen;
+  un->sun_len = (u_char) sizeof (struct sockaddr_un);
 #endif
  *saddrs = (struct sockaddr *) un;
-  *saddrlens = slen;
+  *saddrlens = sizeof (struct sockaddr_un);
 #else
  /* this function should never be called
   * unless AF_UNIX is defined! */
@@ -989,6 +980,11 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
      LOG (GNUNET_ERROR_TYPE_INFO,
           _("Using `%s' instead\n"), unixpath);
    }
+    if (GNUNET_OK !=
+        GNUNET_DISK_directory_create_for_file (unixpath))
+      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
+                                "mkdir",
+                                unixpath);
  }
  if (NULL != unixpath)
  {
diff --git a/src/util/test_connection.c b/src/util/test_connection.c
index 124f3c9d3..13c800995 100644
--- a/src/util/test_connection.c
+++ b/src/util/test_connection.c
@@ -62,9 +62,9 @@ open_listen_socket ()
  if (GNUNET_NETWORK_socket_setsockopt
      (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt");
-  GNUNET_assert (GNUNET_NETWORK_socket_bind
+  GNUNET_assert (GNUNET_OK ==
-                 (desc, (const struct sockaddr *) &sa,
+                 GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
-                  sizeof (sa), 0) == GNUNET_OK);
+                                             sizeof (sa)));
  GNUNET_NETWORK_socket_listen (desc, 5);
  return desc;
 }
diff --git a/src/util/test_connection_addressing.c b/src/util/test_connection_addressing.c
index ea6acdd53..adab28d40 100644
--- a/src/util/test_connection_addressing.c
+++ b/src/util/test_connection_addressing.c
@@ -65,7 +65,7 @@ open_listen_socket ()
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt");
  if (GNUNET_OK !=
      GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
-                                  sizeof (sa), 0))
+                                  sizeof (sa)))
  {
    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                         "bind");
diff --git a/src/util/test_connection_receive_cancel.c b/src/util/test_connection_receive_cancel.c
index e47712d3f..32a00fcfa 100644
--- a/src/util/test_connection_receive_cancel.c
+++ b/src/util/test_connection_receive_cancel.c
@@ -61,9 +61,9 @@ open_listen_socket ()
  if (GNUNET_NETWORK_socket_setsockopt
      (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt");
-  GNUNET_assert (GNUNET_NETWORK_socket_bind
+  GNUNET_assert (GNUNET_OK ==
-                 (desc, (const struct sockaddr *) &sa,
+                 GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
-                  sizeof (sa), 0) == GNUNET_OK);
+                                             sizeof (sa)));
  GNUNET_NETWORK_socket_listen (desc, 5);
  return desc;
 }
diff --git a/src/util/test_connection_timeout.c b/src/util/test_connection_timeout.c
index 27170ed41..ec8057cf2 100644
--- a/src/util/test_connection_timeout.c
+++ b/src/util/test_connection_timeout.c
@@ -58,9 +58,9 @@ open_listen_socket ()
  if (GNUNET_NETWORK_socket_setsockopt
      (desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "setsockopt");
-  GNUNET_assert (GNUNET_NETWORK_socket_bind
+  GNUNET_assert (GNUNET_OK ==
-                 (desc, (const struct sockaddr *) &sa,
+                 GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
-                  sizeof (sa), 0) == GNUNET_OK);
+                                             sizeof (sa)));
  GNUNET_NETWORK_socket_listen (desc, 5);
  return desc;
 }
diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index 30e993411..49b70478d 100644
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -130,20 +130,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
  struct sockaddr_un un;
  const char *unixpath = "/tmp/testsock";
-  size_t slen = strlen (unixpath);
  struct sockaddr *sap[2];
  socklen_t slens[2];
  memset (&un, 0, sizeof (un));
  un.sun_family = AF_UNIX;
-  memcpy (un.sun_path, unixpath, slen);
+  strncpy(un.sun_path, unixpath, sizeof (un.sun_path) - 1);
-  un.sun_path[slen] = '\0';
 #if HAVE_SOCKADDR_IN_SIN_LEN
  un.sun_len = (u_char) sizeof (un);
 #endif
-#if LINUX
-  un.sun_path[0] = '\0';
-#endif
  sap[0] = (struct sockaddr *) &un;
  slens[0] = sizeof (un);