Attachment #6862 for bug #15249

View | Details | Raw Unified | Return to bug 15249
Collapse All | Expand All




	register struct nfs_fattr *fp;
	struct vattr va;
	register struct vattr *vap = &va;
	struct vnode *vp = NULL;
	nfsfh_t nfh;
	fhandle_t *fhp;
	register u_int32_t *tl;

	struct ucred *cred = &nfsd->nd_cr;
	register struct nfs_fattr *fp;
	struct nameidata nd, ind, *ndp = &nd;
	struct vnode *vp, *dirp = NULL;
	nfsfh_t nfh;
	fhandle_t *fhp;
	register caddr_t cp;

	char *cp2;
	struct mbuf *mb, *mb2, *mreq;
	struct mbuf *m2;
	struct vnode *vp = NULL;
	nfsfh_t nfh;
	fhandle_t *fhp;
	struct uio io, *uiop = &io;

	int ioflags, aftat_ret = 1, s, adjust, v3, zeroing;
	char *cp2;
	struct mbuf *mb, *mb2, *mreq, *mrep, *md;
	struct vnode *vp = NULL;
	struct uio io, *uiop = &io;
	u_quad_t frev, cur_usec;





	register int i;
	struct ucred *credanon;
	int error, exflags;
	struct vnode *vp;
#ifdef MNT_EXNORESPORT		/* XXX needs mountd and /etc/exports help yet */
	struct sockaddr_int *saddr;
#endif

	error = VFS_CHECKEXP(mp, nam, &exflags, &credanon);
	if (error)
		return (error); 
	error = VFS_FHTOVP(mp, &fhp->fh_fid, &vp);
	if (error)
		return (error);
#ifdef MNT_EXNORESPORT

		saddr = (struct sockaddr_in *)nam;
		if (saddr->sin_family == AF_INET &&
		    ntohs(saddr->sin_port) >= IPPORT_RESERVED) {
			vput(vp);
			return (NFSERR_AUTHERR | AUTH_TOOWEAK);
		}
	}

	 */
	if (exflags & MNT_EXKERB) {
		if (!kerbflag) {
			vput(vp);
			return (NFSERR_AUTHERR | AUTH_TOOWEAK);
		}
	} else if (kerbflag) {
		vput(vp);
		return (NFSERR_AUTHERR | AUTH_TOOWEAK);
	} else if (cred->cr_uid == 0 || (exflags & MNT_EXPORTANON)) {
		cred->cr_uid = credanon->cr_uid;

	else
		*rdonlyp = 0;

	nfsrv_object_create(vp);

	if (!lockflag)
		VOP_UNLOCK(vp, 0, p);
	*vpp = vp;
	return (0);
}


Lines 769-776 Link Here

(-)nfs_nqlease.c (-1 / +3 lines)
769	nfsd->nd_duration = fxdr_unsigned(int, *tl);	769	nfsd->nd_duration = fxdr_unsigned(int, *tl);
770	error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly,	770	error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly,
771	(nfsd->nd_flag & ND_KERBAUTH), TRUE);	771	(nfsd->nd_flag & ND_KERBAUTH), TRUE);
772	if (error)	772	if (error) {
773	nfsm_reply(0);	773	nfsm_reply(0);
		774	goto nfsmout;
		775	}
774	if (rdonly && flags == ND_WRITE) {	776	if (rdonly && flags == ND_WRITE) {
775	error = EROFS;	777	error = EROFS;
776	vput(vp);	778	vput(vp);

Return to bug 15249

Lines 1943-1948 Link Here

(-)nfs_subs.c (-6 / +8 lines)
1943	register int i;	1943	register int i;
1944	struct ucred *credanon;	1944	struct ucred *credanon;
1945	int error, exflags;	1945	int error, exflags;
		1946	struct vnode *vp;
1946	#ifdef MNT_EXNORESPORT /* XXX needs mountd and /etc/exports help yet */	1947	#ifdef MNT_EXNORESPORT /* XXX needs mountd and /etc/exports help yet */
1947	struct sockaddr_int *saddr;	1948	struct sockaddr_int *saddr;
1948	#endif	1949	#endif
Lines 1961-1967 Link Here
1961	error = VFS_CHECKEXP(mp, nam, &exflags, &credanon);	1962	error = VFS_CHECKEXP(mp, nam, &exflags, &credanon);
1962	if (error)	1963	if (error)
1963	return (error);	1964	return (error);
1964	error = VFS_FHTOVP(mp, &fhp->fh_fid, vpp);	1965	error = VFS_FHTOVP(mp, &fhp->fh_fid, &vp);
1965	if (error)	1966	if (error)
1966	return (error);	1967	return (error);
1967	#ifdef MNT_EXNORESPORT	1968	#ifdef MNT_EXNORESPORT
Lines 1969-1975 Link Here
1969	saddr = (struct sockaddr_in *)nam;	1970	saddr = (struct sockaddr_in *)nam;
1970	if (saddr->sin_family == AF_INET &&	1971	if (saddr->sin_family == AF_INET &&
1971	ntohs(saddr->sin_port) >= IPPORT_RESERVED) {	1972	ntohs(saddr->sin_port) >= IPPORT_RESERVED) {
1972	vput(*vpp);	1973	vput(vp);
1973	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);	1974	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);
1974	}	1975	}
1975	}	1976	}
Lines 1979-1989 Link Here
1979	*/	1980	*/
1980	if (exflags & MNT_EXKERB) {	1981	if (exflags & MNT_EXKERB) {
1981	if (!kerbflag) {	1982	if (!kerbflag) {
1982	vput(*vpp);	1983	vput(vp);
1983	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);	1984	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);
1984	}	1985	}
1985	} else if (kerbflag) {	1986	} else if (kerbflag) {
1986	vput(*vpp);	1987	vput(vp);
1987	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);	1988	return (NFSERR_AUTHERR \| AUTH_TOOWEAK);
1988	} else if (cred->cr_uid == 0 \|\| (exflags & MNT_EXPORTANON)) {	1989	} else if (cred->cr_uid == 0 \|\| (exflags & MNT_EXPORTANON)) {
1989	cred->cr_uid = credanon->cr_uid;	1990	cred->cr_uid = credanon->cr_uid;
Lines 1996-2005 Link Here
1996	else	1997	else
1997	*rdonlyp = 0;	1998	*rdonlyp = 0;
1998		1999
1999	nfsrv_object_create(*vpp);	2000	nfsrv_object_create(vp);
2000		2001
2001	if (!lockflag)	2002	if (!lockflag)
2002	VOP_UNLOCK(*vpp, 0, p);	2003	VOP_UNLOCK(vp, 0, p);
		2004	*vpp = vp;
2003	return (0);	2005	return (0);
2004	}	2006	}
2005		2007

Lines 249-255 Link Here

(-)nfs_serv.c (-4 / +4 lines)
249	register struct nfs_fattr *fp;	249	register struct nfs_fattr *fp;
250	struct vattr va;	250	struct vattr va;
251	register struct vattr *vap = &va;	251	register struct vattr *vap = &va;
252	struct vnode *vp;	252	struct vnode *vp = NULL;
253	nfsfh_t nfh;	253	nfsfh_t nfh;
254	fhandle_t *fhp;	254	fhandle_t *fhp;
255	register u_int32_t *tl;	255	register u_int32_t *tl;
Lines 453-459 Link Here
453	struct ucred *cred = &nfsd->nd_cr;	453	struct ucred *cred = &nfsd->nd_cr;
454	register struct nfs_fattr *fp;	454	register struct nfs_fattr *fp;
455	struct nameidata nd, ind, *ndp = &nd;	455	struct nameidata nd, ind, *ndp = &nd;
456	struct vnode vp, dirp;	456	struct vnode vp, dirp = NULL;
457	nfsfh_t nfh;	457	nfsfh_t nfh;
458	fhandle_t *fhp;	458	fhandle_t *fhp;
459	register caddr_t cp;	459	register caddr_t cp;
Lines 775-781 Link Here
775	char *cp2;	775	char *cp2;
776	struct mbuf mb, mb2, *mreq;	776	struct mbuf mb, mb2, *mreq;
777	struct mbuf *m2;	777	struct mbuf *m2;
778	struct vnode *vp;	778	struct vnode *vp = NULL;
779	nfsfh_t nfh;	779	nfsfh_t nfh;
780	fhandle_t *fhp;	780	fhandle_t *fhp;
781	struct uio io, *uiop = &io;	781	struct uio io, *uiop = &io;
Lines 1168-1174 Link Here
1168	int ioflags, aftat_ret = 1, s, adjust, v3, zeroing;	1168	int ioflags, aftat_ret = 1, s, adjust, v3, zeroing;
1169	char *cp2;	1169	char *cp2;
1170	struct mbuf mb, mb2, mreq, mrep, *md;	1170	struct mbuf mb, mb2, mreq, mrep, *md;
1171	struct vnode *vp;	1171	struct vnode *vp = NULL;
1172	struct uio io, *uiop = &io;	1172	struct uio io, *uiop = &io;
1173	u_quad_t frev, cur_usec;	1173	u_quad_t frev, cur_usec;
1174		1174