From a127d00d946eb41270f84e4ce70b227c1cb40752 Mon Sep 17 00:00:00 2001 From: "J. Bruce Fields" Date: Wed, 22 Jun 2005 17:16:23 +0000 Subject: [PATCH] --- yaml --- r: 2773 b: refs/heads/master c: 438b6fdebf2a2e8573e7290bc176feb4d4475f43 h: refs/heads/master i: 2771: a1c7295159912c6fde0e78788aedd29ebf79c30e v: v3 --- [refs] | 2 +- trunk/net/sunrpc/auth_gss/auth_gss.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 99b4cdc4ee58..b180a213aa9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e50a1c2e1f816c81eed6a589019052cb44189267 +refs/heads/master: 438b6fdebf2a2e8573e7290bc176feb4d4475f43 diff --git a/trunk/net/sunrpc/auth_gss/auth_gss.c b/trunk/net/sunrpc/auth_gss/auth_gss.c index a33b627cbef4..7d88db83ab12 100644 --- a/trunk/net/sunrpc/auth_gss/auth_gss.c +++ b/trunk/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;