Module Name: src
Committed By: bouyer
Date: Sat Apr 20 14:00:41 UTC 2013
Modified Files:
src/doc [netbsd-6]: CHANGES-6.1
src/lib/libc/rpc [netbsd-6]: clnt_vc.c
Log Message:
Revert ticket 875, it doesn't applies to netbsd-6 (the bug was introduced
in 1.18, netbsd-6 is at 1.17)
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-6.1
cvs rdiff -u -r1.17.8.3 -r1.17.8.4 src/lib/libc/rpc/clnt_vc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.118 src/doc/CHANGES-6.1:1.1.2.119
--- src/doc/CHANGES-6.1:1.1.2.118 Sat Apr 20 10:23:52 2013
+++ src/doc/CHANGES-6.1 Sat Apr 20 14:00:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.118 2013/04/20 10:23:52 bouyer Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.119 2013/04/20 14:00:40 bouyer Exp $
A complete list of changes from the 6.0 release until the 6.1 release:
@@ -8880,12 +8880,6 @@ lib/libc/gen/realpath.3 1.13
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
Index: src/lib/libc/rpc/clnt_vc.c
diff -u src/lib/libc/rpc/clnt_vc.c:1.17.8.3 src/lib/libc/rpc/clnt_vc.c:1.17.8.4
--- src/lib/libc/rpc/clnt_vc.c:1.17.8.3 Sat Apr 20 10:13:23 2013
+++ src/lib/libc/rpc/clnt_vc.c Sat Apr 20 14:00:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_vc.c,v 1.17.8.3 2013/04/20 10:13:23 bouyer Exp $ */
+/* $NetBSD: clnt_vc.c,v 1.17.8.4 2013/04/20 14:00:40 bouyer Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -38,7 +38,7 @@ static char *sccsid = "@(#)clnt_tcp.c 1.
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.8.3 2013/04/20 10:13:23 bouyer Exp $");
+__RCSID("$NetBSD: clnt_vc.c,v 1.17.8.4 2013/04/20 14:00:40 bouyer Exp $");
#endif
#endif
@@ -711,7 +711,7 @@ read_vc(ctp, buf, len)
/* 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:
