svn commit: r184875 - in user/dfr/gssapi/6/sys: . nfsserver
Doug Rabson
dfr at FreeBSD.org
Wed Nov 12 02:41:16 PST 2008
Author: dfr
Date: Wed Nov 12 10:41:15 2008
New Revision: 184875
URL: http://svn.freebsd.org/changeset/base/184875
Log:
MFC: 184868,184869
Modified:
user/dfr/gssapi/6/sys/ (props changed)
user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c
user/dfr/gssapi/6/sys/nfsserver/nfs_srvsubs.c
Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c
==============================================================================
--- user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Wed Nov 12 10:38:52 2008 (r184874)
+++ user/dfr/gssapi/6/sys/nfsserver/nfs_srvkrpc.c Wed Nov 12 10:41:15 2008 (r184875)
@@ -393,8 +393,13 @@ nfssvc_program(struct svc_req *rqst, SVC
svc_freereq(rqst);
return;
}
- if (!svc_sendreply_mbuf(rqst, mrep))
- svcerr_systemerr(rqst);
+ if (nd.nd_repstat & NFSERR_AUTHERR) {
+ svcerr_auth(rqst, nd.nd_repstat & ~NFSERR_AUTHERR);
+ m_freem(mrep);
+ } else {
+ if (!svc_sendreply_mbuf(rqst, mrep))
+ svcerr_systemerr(rqst);
+ }
svc_freereq(rqst);
}
Modified: user/dfr/gssapi/6/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- user/dfr/gssapi/6/sys/nfsserver/nfs_srvsubs.c Wed Nov 12 10:38:52 2008 (r184874)
+++ user/dfr/gssapi/6/sys/nfsserver/nfs_srvsubs.c Wed Nov 12 10:41:15 2008 (r184875)
@@ -1139,7 +1139,8 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
*/
mountreq = FALSE;
if (v3) {
- if (nfsd->nd_procnum == NFSPROC_FSINFO)
+ if (nfsd->nd_procnum == NFSPROC_FSINFO
+ || nfsd->nd_procnum == NFSPROC_GETATTR)
mountreq = TRUE;
} else {
if (nfsd->nd_procnum == NFSPROC_FSSTAT
@@ -1147,7 +1148,7 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
mountreq = TRUE;
}
if (!mountreq) {
- error = NFSERR_AUTHERR | AUTH_REJECTCRED;
+ error = NFSERR_AUTHERR | AUTH_TOOWEAK;
goto out;
}
}
More information about the svn-src-user
mailing list