[src/netbsd-1-4]: src/sys/kern pullup 1.47->1.48 (thorpej)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae114867658c
branches:  netbsd-1-4
changeset: 468720:ae114867658c
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Jun 18 17:14:35 1999 +0000

description:
pullup 1.47->1.48 (thorpej)

diffstat:

 sys/kern/uipc_socket.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 0b381dc7a1de -r ae114867658c sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Fri Jun 18 17:12:28 1999 +0000
+++ b/sys/kern/uipc_socket.c    Fri Jun 18 17:14:35 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.44 1999/03/23 10:45:37 lukem Exp $   */
+/*     $NetBSD: uipc_socket.c,v 1.44.2.1 1999/06/18 17:14:35 perry Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -404,8 +404,12 @@
                s = splsoftnet();
                if (so->so_state & SS_CANTSENDMORE)
                        snderr(EPIPE);
-               if (so->so_error)
-                       snderr(so->so_error);
+               if (so->so_error) {
+                       error = so->so_error;
+                       so->so_error = 0;
+                       splx(s);
+                       goto release;
+               }
                if ((so->so_state & SS_ISCONNECTED) == 0) {
                        if (so->so_proto->pr_flags & PR_CONNREQUIRED) {
                                if ((so->so_state & SS_ISCONFIRMING) == 0 &&