summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-10-27 14:28:44 +0100
committerMichael Adam <obnox@samba.org>2008-10-27 14:59:33 +0100
commitb881d2ee78f685aea7ae8b67b3e0fb3c4f5205ed (patch)
treeec38f392e15daf1cdf05ea1d11114486ea8911fd /source3/winbindd
parent68aa9bd67f9556f608bfb321d593617bd346915f (diff)
downloadsamba-b881d2ee78f685aea7ae8b67b3e0fb3c4f5205ed.tar.gz
samba-b881d2ee78f685aea7ae8b67b3e0fb3c4f5205ed.tar.bz2
samba-b881d2ee78f685aea7ae8b67b3e0fb3c4f5205ed.zip
[s3]winbind: fix smbd hanging on Solaris when winbindd closes socket.
On some versions of Solaris, we observed a strange effect of close(2) on a socket: After the server (here winbindd) called close, the client fd was not marked as readable for select. And a write call to the fd did not produce an error EPIPE but just returned as if successful. So while winbindd had called remove_client(), the corresponding smbd still thought that it was connected, but failed to retrieve answers for its queries. This patch works around the problem by forcing the client fd to the readable state: Just write one byte into the socket before closing. Michael
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 5d4f21a820..ac2a87ffce 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -727,12 +727,17 @@ static void new_connection(int listen_sock, bool privileged)
static void remove_client(struct winbindd_cli_state *state)
{
+ char c = 0;
+
/* It's a dead client - hold a funeral */
if (state == NULL) {
return;
}
-
+
+ /* tell client, we are closing ... */
+ write(state->sock, &c, sizeof(c));
+
/* Close socket */
close(state->sock);