From: fredrik <fredrik@959494ce-11ee-0310-bf91-de5d638817bd>
Date: Wed, 11 Apr 2007 00:23:51 +0000 (+0000)
Subject: Ensure that UNIX sockets are automatically unlinked upon close.
X-Git-Tag: 0.3~72
X-Git-Url: http://git.dolda2000.com/gitweb/?p=doldaconnect.git;a=commitdiff_plain;h=b870805e004de4bd5c9f78d35744581de6646770

Ensure that UNIX sockets are automatically unlinked upon close.


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

diff --git a/daemon/net.c b/daemon/net.c
index 4147031..f2ade0f 100644
--- a/daemon/net.c
+++ b/daemon/net.c
@@ -288,8 +288,7 @@ void putsock(struct socket *sk)
 	    }
 	    break;
 	}
-	if(sk->fd >= 0)
-	    close(sk->fd);
+	closesock(sk);
 	if(sk->remote != NULL)
 	    free(sk->remote);
 	free(sk);
@@ -487,6 +486,16 @@ static void sockflush(struct socket *sk)
 
 void closesock(struct socket *sk)
 {
+    struct sockaddr_un *un;
+    
+    if((sk->family == AF_UNIX) && !sockgetlocalname(sk, (struct sockaddr **)&un, NULL) && (un->sun_family == PF_UNIX))
+    {
+	if(strchr(un->sun_path, '/'))
+	{
+	    if(unlink(un->sun_path))
+		flog(LOG_WARNING, "could not unlink UNIX socket %s: %s", un->sun_path, strerror(errno));
+	}
+    }
     sk->state = SOCK_STL;
     close(sk->fd);
     sk->fd = -1;
@@ -1061,7 +1070,8 @@ int sockgetlocalname(struct socket *sk, struct sockaddr **namebuf, socklen_t *le
 	return(-1);
     }
     *namebuf = memcpy(smalloc(len), &name, len);
-    *lenbuf = len;
+    if(lenbuf != NULL)
+	*lenbuf = len;
     return(0);
 }