Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desupport link/unlink of directories. noted by Elad Efrat.

This commit is contained in:
yamt 2008-03-08 08:03:46 +00:00
parent 60381203e0
commit e769ba6b4a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/nfs/nfs_serv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.136 2008/02/28 17:07:49 elad Exp $ */
/* $NetBSD: nfs_serv.c,v 1.137 2008/03/08 08:03:46 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.136 2008/02/28 17:07:49 elad Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.137 2008/03/08 08:03:46 yamt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1759,16 +1759,15 @@ nfsrv_remove(nfsd, slp, lwp, mrq)
}
if (!error) {
vp = nd.ni_vp;
if (vp->v_type == VDIR &&
(error = kauth_authorize_generic(cred,
KAUTH_GENERIC_ISSUSER, NULL)) != 0)
if (vp->v_type == VDIR) {
error = EPERM;
goto out;
}
/*
* The root of a mounted filesystem cannot be deleted.
*/
if (vp->v_vflag & VV_ROOT) {
error = EBUSY;
goto out;
}
out:
if (!error) {
@ -2083,9 +2082,10 @@ nfsrv_link(nfsd, slp, lwp, mrq)
nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft);
return (0);
}
if (vp->v_type == VDIR && (error = kauth_authorize_generic(cred,
KAUTH_GENERIC_ISSUSER, NULL)) != 0)
if (vp->v_type == VDIR) {
error = EPERM;
goto out1;
}
nd.ni_cnd.cn_cred = cred;
nd.ni_cnd.cn_nameiop = CREATE;
nd.ni_cnd.cn_flags = LOCKPARENT;