[PATCH] RPC: Don't fall back from krb5p to krb5i

 We shouldn't be silently falling back from krb5p to krb5i.

 Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a33b627cbef..7d88db83ab1 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -675,9 +675,8 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
                 goto err_free;
         }
         gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor);
-        /* FIXME: Will go away once privacy support is merged in */
-        if (gss_auth->service == RPC_GSS_SVC_PRIVACY)
-                gss_auth->service = RPC_GSS_SVC_INTEGRITY;
+        if (gss_auth->service == 0)
+                goto err_put_mech;
         INIT_LIST_HEAD(&gss_auth->upcalls);
         spin_lock_init(&gss_auth->lock);
         auth = &gss_auth->rpc_auth;