From: deraadt <deraadt@openbsd.org>
Date: Fri, 31 Jan 1997 10:33:46 +0000 (+0000)
Subject: do not sillyrename directories; from freebsd
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=91d3b8089d0e3e19c4912bd19da1c6d9534c2cc3;p=openbsd

do not sillyrename directories; from freebsd
---

diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 1c2114df0e1..a657655ac38 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.12 1996/11/12 15:51:34 mickey Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.13 1997/01/31 10:33:46 deraadt Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -1536,7 +1536,7 @@ nfs_rename(v)
 	 * rename of the new file over it.
 	 */
 	if (tvp && tvp->v_usecount > 1 && !VTONFS(tvp)->n_sillyrename &&
-		!nfs_sillyrename(tdvp, tvp, tcnp)) {
+		tvp->v_type != VDIR && !nfs_sillyrename(tdvp, tvp, tcnp)) {
 		vrele(tvp);
 		tvp = NULL;
 	}