summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2013-04-12 18:10:56 -0400
committerJ. Bruce Fields <bfields@redhat.com>2013-04-26 16:18:15 -0400
commitdd30333cf5a2f9dfecda5c6f4523133f13847aae (patch)
tree3f43570fea3ae42810b08a1b410b725ed22657b1
parentaa387d6ce15330e09037947147c5a5a2ba42a0e8 (diff)
downloadlinux-3.10-dd30333cf5a2f9dfecda5c6f4523133f13847aae.tar.gz
linux-3.10-dd30333cf5a2f9dfecda5c6f4523133f13847aae.tar.bz2
linux-3.10-dd30333cf5a2f9dfecda5c6f4523133f13847aae.zip
nfsd4: better error return to indicate SSV non-support
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 <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4state.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index e39bf5381bc..a964a176107 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 :-/ */
}