Received-SPF: pass (google.com: domain of linux-nfs+bounces-908-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <d64bce97-1362-4f73-8ae6-52dc92284861@redhat.com>
Date: Wed, 3 Jan 2024 18:38:20 -0500
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 1/2] gssapi: revert commit f5b6e6fdb1e6
Content-Language: en-US
To: Olga Kornievskaia <olga.kornievskaia@gmail.com>
Cc: linux-nfs@vger.kernel.org, chuck.lever@oracle.com
References: <20231206213127.55310-1-olga.kornievskaia@gmail.com>
From: Steve Dickson <steved@redhat.com>
In-Reply-To: <20231206213127.55310-1-olga.kornievskaia@gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit


On 12/6/23 4:31 PM, Olga Kornievskaia wrote:
> From: Olga Kornievskaia <kolga@netapp.com>
> 
> Revert commit f5b6e6fdb1e6 "gss-api: expose gss major/minor error in
> authgss_refresh()".
> 
> Instead of modifying existing api, use rpc_gss_seccreate() which exposes
> the error values.
> 
> Signed-off-by: Olga Kornievskaia <kolga@netapp.umich>
Committed... (tag: libtirpc-1-3-5-rc1

steved.
> ---
>   src/auth_gss.c       | 14 ++++++--------
>   tirpc/rpc/auth_gss.h |  2 --
>   2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/src/auth_gss.c b/src/auth_gss.c
> index 3127b92..e317664 100644
> --- a/src/auth_gss.c
> +++ b/src/auth_gss.c
> @@ -184,7 +184,6 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
>   	AUTH			*auth, *save_auth;
>   	struct rpc_gss_data	*gd;
>   	OM_uint32		min_stat = 0;
> -	rpc_gss_options_ret_t	ret;
>   
>   	gss_log_debug("in authgss_create()");
>   
> @@ -230,12 +229,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
>   	save_auth = clnt->cl_auth;
>   	clnt->cl_auth = auth;
>   
> -	memset(&ret, 0, sizeof(rpc_gss_options_ret_t));
> -	if (!authgss_refresh(auth, &ret)) {
> +	if (!authgss_refresh(auth, NULL))
>   		auth = NULL;
> -		sec->major_status = ret.major_status;
> -		sec->minor_status = ret.minor_status;
> -	}
>   	else
>   		authgss_auth_get(auth); /* Reference for caller */
>   
> @@ -624,9 +619,12 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
>   }
>   
>   static bool_t
> -authgss_refresh(AUTH *auth, void *ret)
> +authgss_refresh(AUTH *auth, void *dummy)
>   {
> -	return _rpc_gss_refresh(auth, (rpc_gss_options_ret_t *)ret);
> +	rpc_gss_options_ret_t ret;
> +
> +	memset(&ret, 0, sizeof(ret));
> +	return _rpc_gss_refresh(auth, &ret);
>   }
>   
>   bool_t
> diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
> index a530d42..f2af6e9 100644
> --- a/tirpc/rpc/auth_gss.h
> +++ b/tirpc/rpc/auth_gss.h
> @@ -64,8 +64,6 @@ struct rpc_gss_sec {
>   	rpc_gss_svc_t	svc;		/* service */
>   	gss_cred_id_t	cred;		/* cred handle */
>   	u_int		req_flags;	/* req flags for init_sec_context */
> -	int		major_status;
> -	int		minor_status;
>   };
>   
>   /* Private data required for kernel implementation */