svn commit: samba r3183 - in branches/SAMBA_4_0/source/lib: messaging socket

[tridge at samba.org]

Author: tridge
Date: 2004-10-25 03:30:39 +0000 (Mon, 25 Oct 2004)
New Revision: 3183

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/lib&rev=3183&nolog=1

Log:
moved the unlink of the messaging unixdom socket to the messaging destructor



Modified:
   branches/SAMBA_4_0/source/lib/messaging/messaging.c
   branches/SAMBA_4_0/source/lib/socket/socket_unix.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/messaging/messaging.c
===================================================================
--- branches/SAMBA_4_0/source/lib/messaging/messaging.c	2004-10-25 02:59:48 UTC (rev 3182)
+++ branches/SAMBA_4_0/source/lib/messaging/messaging.c	2004-10-25 03:30:39 UTC (rev 3183)
@@ -435,6 +435,7 @@
 {
 	struct messaging_state *msg = msg_ctx;
 	event_remove_fd(msg->event.ev, msg->event.fde);
+	unlink(msg->path);
 	return 0;
 }
 

Modified: branches/SAMBA_4_0/source/lib/socket/socket_unix.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket/socket_unix.c	2004-10-25 02:59:48 UTC (rev 3182)
+++ branches/SAMBA_4_0/source/lib/socket/socket_unix.c	2004-10-25 03:30:39 UTC (rev 3183)
@@ -71,15 +71,6 @@
 static void unixdom_close(struct socket_context *sock)
 {
 	close(sock->fd);
-	/* if we were listening, then don't leave the socket lying
-	   around in the filesystem */
-
-#if 0
-	/* FIXME - this doesn't work after fork(), etc */
-	if (sock->private_data) {
-		unlink((const char *)sock->private_data);
-	}
-#endif
 }
 
 static NTSTATUS unixdom_connect(struct socket_context *sock,