diff options
| author | Niels Provos <provos@cvs.openbsd.org> | 2001-03-06 19:42:44 +0000 |
|---|---|---|
| committer | Niels Provos <provos@cvs.openbsd.org> | 2001-03-06 19:42:44 +0000 |
| commit | 338e1fade409dc4ab6f63f101406bb48cb6fabf1 (patch) | |
| tree | b44299fc1270d74c77a85b712d58cd0b42f7148f /sys/kern | |
| parent | 95f6cce37ce329d0abd23458c6d6c442d06af771 (diff) | |
different fix, we still need to deliver EV_EOF; from jlemon@freebsd.org
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/uipc_socket.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 64c1efd1a7f..854d804f124 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.32 2001/03/06 17:06:23 provos Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.33 2001/03/06 19:42:43 provos Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -883,12 +883,14 @@ sorflush(so) (void) sblock(sb, M_WAITOK); s = splimp(); socantrcvmore(so); - /* XXX - the bzero stumps all over so_rcv, rm knotes while possible */ - if (sb->sb_flags & SB_KNOTE) - knote_remove(curproc, &sb->sb_sel.si_note); sbunlock(sb); asb = *sb; bzero((caddr_t)sb, sizeof (*sb)); + /* XXX - the bzero stumps all over so_rcv */ + if (asb.sb_flags & SB_KNOTE) { + sb->sb_sel.si_note = asb.sb_sel.si_note; + sb->sb_flags = SB_KNOTE; + } splx(s); if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); |