d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't let the user try and unlink() a directory on a NFS server.

Browse Source 
Obtained from:  NetBSD
This commit is contained in:
Peter Wemm 1998-05-31 18:28:45 +00:00
parent 124765333e
commit f82a64e18d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=36524
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/nfs/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.95 1998/05/31 18:25:32 peter Exp $
* $Id: nfs_vnops.c,v 1.96 1998/05/31 18:27:07 peter Exp $
*/
@ -1450,7 +1450,9 @@ nfs_remove(ap)
if (vp->v_usecount < 1)
panic("nfs_remove: bad v_usecount");
#endif
if (vp->v_usecount == 1 || (np->n_sillyrename &&
if (vp->v_type == VDIR)
error = EPERM;
else if (vp->v_usecount == 1 || (np->n_sillyrename &&
VOP_GETATTR(vp, &vattr, cnp->cn_cred, cnp->cn_proc) == 0 &&
vattr.va_nlink > 1)) {
/*

6
sys/nfsclient/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.95 1998/05/31 18:25:32 peter Exp $
* $Id: nfs_vnops.c,v 1.96 1998/05/31 18:27:07 peter Exp $
*/
@ -1450,7 +1450,9 @@ nfs_remove(ap)
if (vp->v_usecount < 1)
panic("nfs_remove: bad v_usecount");
#endif
if (vp->v_usecount == 1 || (np->n_sillyrename &&
if (vp->v_type == VDIR)
error = EPERM;
else if (vp->v_usecount == 1 || (np->n_sillyrename &&
VOP_GETATTR(vp, &vattr, cnp->cn_cred, cnp->cn_proc) == 0 &&
vattr.va_nlink > 1)) {
/*