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

[linux-2.6-block.git] / net / sunrpc / auth_gss / auth_gss.c

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a33b627cbef4ba8ad729a8c1f1278da3ea1a4f61..7d88db83ab12904e313f10b88b69e33ec47e54a2 100644 (file)
--- 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;