From owner-svn-src-stable-9@freebsd.org  Sat May  7 21:34:05 2016
Return-Path: <owner-svn-src-stable-9@freebsd.org>
Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCD3EB32946;
 Sat,  7 May 2016 21:34:05 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 900431371;
 Sat,  7 May 2016 21:34:05 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u47LY4pv058787;
 Sat, 7 May 2016 21:34:04 GMT (envelope-from rmacklem@FreeBSD.org)
Received: (from rmacklem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u47LY4vU058786;
 Sat, 7 May 2016 21:34:04 GMT (envelope-from rmacklem@FreeBSD.org)
Message-Id: <201605072134.u47LY4vU058786@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to
 rmacklem@FreeBSD.org using -f
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sat, 7 May 2016 21:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r299225 - stable/9/sys/fs/nfsserver
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9/>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 May 2016 21:34:05 -0000

Author: rmacklem
Date: Sat May  7 21:34:04 2016
New Revision: 299225
URL: https://svnweb.freebsd.org/changeset/base/299225

Log:
  MFC: r298523
  Allow the NFSv4 server to reply NFSERR_WRONGSEC for the SetClientID operation.
  
  It was reported via email that a Linux client couldn't do a Kerberized
  NFS mount when only "sec=krb5" was specified for the exports. The Linux
  client attempted a mount via krb5i and the server replied NFSERR_SERVERFAULT.
  Although NFSERR_WRONGSEC isn't listed as an error for SetClientID, I
  think it is the correct reply, so this patch enables that.
  I do not know if this fixes the mount attempt, but adding "krb5i" to the
  list of allowed security flavours does allow the mount to work.

Modified:
  stable/9/sys/fs/nfsserver/nfs_nfsdsubs.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/nfsserver/nfs_nfsdsubs.c
==============================================================================
--- stable/9/sys/fs/nfsserver/nfs_nfsdsubs.c	Sat May  7 20:23:26 2016	(r299224)
+++ stable/9/sys/fs/nfsserver/nfs_nfsdsubs.c	Sat May  7 21:34:04 2016	(r299225)
@@ -1130,6 +1130,7 @@ static short nfsv4err_setclientid[] = {
 	NFSERR_INVAL,
 	NFSERR_RESOURCE,
 	NFSERR_SERVERFAULT,
+	NFSERR_WRONGSEC,
 	0,
 };