[src/netbsd-6-0]: src Revert ticket 875, it doesn't applies to netbsd-6 (the ...

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

details:   https://anonhg.NetBSD.org/src/rev/7a272143c0ed
branches:  netbsd-6-0
changeset: 774797:7a272143c0ed
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 20 14:02:50 2013 +0000

description:
Revert ticket 875, it doesn't applies to netbsd-6 (the bug was introduced
in 1.18, netbsd-6 is at 1.17)

diffstat:

 doc/CHANGES-6.0.2      |  8 +-------
 lib/libc/rpc/clnt_vc.c |  6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (49 lines):

diff -r e13d92d99987 -r 7a272143c0ed doc/CHANGES-6.0.2
--- a/doc/CHANGES-6.0.2 Sat Apr 20 10:24:36 2013 +0000
+++ b/doc/CHANGES-6.0.2 Sat Apr 20 14:02:50 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.2,v 1.1.2.29 2013/04/20 10:24:36 bouyer Exp $
+# $NetBSD: CHANGES-6.0.2,v 1.1.2.30 2013/04/20 14:02:50 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2
 release:
@@ -226,12 +226,6 @@
        argument for resolvedpath.
        [christos, ticket #874]
 
-lib/libc/rpc/clnt_vc.c                         1.22
-
-       PR/47747: Thorsten Brehm: TCP-based RPC client calls no longer
-       terminate when connections break. Return proper error code.
-       [christos, ticket #875]
-
 sys/kern/subr_kmem.c                           1.47
 
        addresses PR/47512
diff -r e13d92d99987 -r 7a272143c0ed lib/libc/rpc/clnt_vc.c
--- a/lib/libc/rpc/clnt_vc.c    Sat Apr 20 10:24:36 2013 +0000
+++ b/lib/libc/rpc/clnt_vc.c    Sat Apr 20 14:02:50 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt_vc.c,v 1.17.12.2 2013/04/20 10:13:56 bouyer Exp $ */
+/*     $NetBSD: clnt_vc.c,v 1.17.12.3 2013/04/20 14:02:50 bouyer Exp $ */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,7 +36,7 @@
 static char *sccsid = "@(#)clnt_tcp.c  2.2 88/08/01 4.0 RPCSRC";
 static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
 #else
-__RCSID("$NetBSD: clnt_vc.c,v 1.17.12.2 2013/04/20 10:13:56 bouyer Exp $");
+__RCSID("$NetBSD: clnt_vc.c,v 1.17.12.3 2013/04/20 14:02:50 bouyer Exp $");
 #endif
 #endif
  
@@ -709,7 +709,7 @@
                /* premature eof */
                ct->ct_error.re_errno = ECONNRESET;
                ct->ct_error.re_status = RPC_CANTRECV;
-               nread = -1;  /* it's really an error */
+               len = -1;  /* it's really an error */
                break;
 
        case -1: