Module Name: src
Committed By: bouyer
Date: Sat Apr 20 14:02:50 UTC 2013
Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.2
src/lib/libc/rpc [netbsd-6-0]: 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.29 -r1.1.2.30 src/doc/CHANGES-6.0.2
cvs rdiff -u -r1.17.12.2 -r1.17.12.3 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.0.2
diff -u src/doc/CHANGES-6.0.2:1.1.2.29 src/doc/CHANGES-6.0.2:1.1.2.30
--- src/doc/CHANGES-6.0.2:1.1.2.29 Sat Apr 20 10:24:36 2013
+++ src/doc/CHANGES-6.0.2 Sat Apr 20 14:02:50 2013
@@ -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 @@ 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.12.2 src/lib/libc/rpc/clnt_vc.c:1.17.12.3
--- src/lib/libc/rpc/clnt_vc.c:1.17.12.2 Sat Apr 20 10:13:56 2013
+++ src/lib/libc/rpc/clnt_vc.c Sat Apr 20 14:02:50 2013
@@ -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 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.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 @@ 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:
