From patchwork Wed Apr 24 15:43:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 2485131 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 127D03FD85 for ; Wed, 24 Apr 2013 15:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755069Ab3DXPnF (ORCPT ); Wed, 24 Apr 2013 11:43:05 -0400 Received: from fieldses.org ([174.143.236.118]:44230 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754376Ab3DXPnF (ORCPT ); Wed, 24 Apr 2013 11:43:05 -0400 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1UV1qa-0005YJ-Gc for linux-nfs@vger.kernel.org; Wed, 24 Apr 2013 11:43:04 -0400 Date: Wed, 24 Apr 2013 11:43:04 -0400 To: linux-nfs@vger.kernel.org Subject: [PATCH] nfsd4: better error return to indicate SSV non-support Message-ID: <20130424154304.GF20275@fieldses.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) From: "J. Bruce Fields" Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" As 4.1 becomes less experimental and SSV still isn't implemented, we have to admit it's not going to be, and return some sensible error rather than just saying "our server's broken". Discussion in the ietf group hasn't turned up any objections to using NFS4ERR_ENC_ALG_UNSUPP for that purpose. Signed-off-by: J. Bruce Fields --- fs/nfsd/nfs4state.c | 1 + 1 file changed, 1 insertion(+) Committing for 3.10.--b. diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index e39bf53..a964a17 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1651,6 +1651,7 @@ nfsd4_exchange_id(struct svc_rqst *rqstp, default: /* checked by xdr code */ WARN_ON_ONCE(1); case SP4_SSV: + return nfserr_encr_alg_unsupp; case SP4_MACH_CRED: return nfserr_serverfault; /* no excuse :-/ */ }