From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Wed, 11 Apr 2007 11:30:13 +0000 (+0000)
Subject: Don't print the path from Unix sockets as abstract peers seem to not follow the speci... 
X-Git-Tag: 0.3~42
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=6a97462ee92722d88e01bb18abd57f1f44d5125b

Don't print the path from Unix sockets as abstract peers seem to not follow the specification.


git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@895 959494ce-11ee-0310-bf91-de5d638817bd
---

diff --git a/daemon/net.c b/daemon/net.c
index 00bc465..16c7bbb 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -1234,9 +1234,6 @@ int addreq(struct sockaddr *x, struct sockaddr *y)
 
 char *formataddress(struct sockaddr *arg, socklen_t arglen)
 {
-    struct sockaddr_un *UNIX; /* Some wise guy has #defined unix with
-			       * lowercase letters to 1, so I do this
-			       * instead. */
     struct sockaddr_in *ipv4;
 #ifdef HAVE_IPV6
     struct sockaddr_in6 *ipv6;
@@ -1250,8 +1247,7 @@ char *formataddress(struct sockaddr *arg, socklen_t arglen)
     switch(arg->sa_family)
     {
     case AF_UNIX:
-	UNIX = (struct sockaddr_un *)arg;
-	ret = sprintf2("%s", UNIX->sun_path);
+	ret = sstrdup("Unix socket");
 	break;
     case AF_INET:
 	ipv4 = (struct sockaddr_in *)arg;