From owner-svn-src-user@FreeBSD.ORG  Wed Nov 12 10:41:15 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F28A7106567B;
	Wed, 12 Nov 2008 10:41:15 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E55138FC20;
	Wed, 12 Nov 2008 10:41:15 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mACAfFHH028285;
	Wed, 12 Nov 2008 10:41:15 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mACAfFNu028283;
	Wed, 12 Nov 2008 10:41:15 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811121041.mACAfFNu028283@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 12 Nov 2008 10:41:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184875 - in user/dfr/gssapi/6/sys: . nfsserver
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Nov 2008 10:41:16 -0000

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;
 		}
 	}