Dolda2000 GitWeb
/
doldaconnect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't print the path from Unix sockets as abstract peers seem to not follow the speci...
[doldaconnect.git]
/
daemon
/
net.c
diff --git
a/daemon/net.c
b/daemon/net.c
index
00bc465
..
16c7bbb
100644
(file)
--- 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)
{
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;
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:
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;
break;
case AF_INET:
ipv4 = (struct sockaddr_in *)arg;