summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-25 03:30:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:37 -0500
commit75ed4f7cc4d39b85cf6dba040cbf188fac3ed464 (patch)
tree95eb4af6fe56d721a934b02332f5b1274959f69d
parent35a11f0e6132a48136500f10be31ac9291a4d25a (diff)
downloadsamba-75ed4f7cc4d39b85cf6dba040cbf188fac3ed464.tar.gz
samba-75ed4f7cc4d39b85cf6dba040cbf188fac3ed464.tar.bz2
samba-75ed4f7cc4d39b85cf6dba040cbf188fac3ed464.zip
r3183: moved the unlink of the messaging unixdom socket to the messaging destructor
(This used to be commit ab222b236a091d31b1f5f2cba150a11585ab5836)
-rw-r--r--source4/lib/messaging/messaging.c1
-rw-r--r--source4/lib/socket/socket_unix.c9
2 files changed, 1 insertions, 9 deletions
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index b0ca9cc41e..13c1a049f8 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -435,6 +435,7 @@ static int messaging_destructor(void *msg_ctx)
{
struct messaging_state *msg = msg_ctx;
event_remove_fd(msg->event.ev, msg->event.fde);
+ unlink(msg->path);
return 0;
}
diff --git a/source4/lib/socket/socket_unix.c b/source4/lib/socket/socket_unix.c
index 038ce3b3b6..df929d92b4 100644
--- a/source4/lib/socket/socket_unix.c
+++ b/source4/lib/socket/socket_unix.c
@@ -71,15 +71,6 @@ static NTSTATUS unixdom_init(struct socket_context *sock)
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,