mirror of
https://github.com/samba-team/samba.git
synced 2025-03-22 02:50:28 +03:00
merge from tridge
(This used to be ctdb commit eb64cde53ec5ed6949df1684e5c148f2294b1da7)
This commit is contained in:
commit
5d82f89a55
@ -167,16 +167,6 @@ void ctdb_tcp_node_connect(struct event_context *ev, struct timed_event *te,
|
||||
ctdb_node_connect_write, node);
|
||||
}
|
||||
|
||||
/*
|
||||
destroy a ctdb_incoming structure
|
||||
*/
|
||||
static int ctdb_incoming_destructor(struct ctdb_incoming *in)
|
||||
{
|
||||
close(in->fd);
|
||||
in->fd = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
called when we get contacted by another node
|
||||
currently makes no attempt to check if the connection is really from a ctdb
|
||||
@ -207,8 +197,6 @@ static void ctdb_listen_event(struct event_context *ev, struct fd_event *fde,
|
||||
|
||||
in->queue = ctdb_queue_setup(ctdb, in, in->fd, CTDB_TCP_ALIGNMENT,
|
||||
ctdb_tcp_read_cb, in);
|
||||
|
||||
talloc_set_destructor(in, ctdb_incoming_destructor);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user