Date: Tue, 20 Jun 2023 14:56:11 -0700 From: Benjamin Kaduk <bjkfbsd@gmail.com> To: John Baldwin <jhb@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 2e2a1c8ecf63 - main - libgssapi: Remove set but unused variable. Message-ID: <CAJ5_RoAO-MK8vbPQwg_pmK3CT1JULhgVzVSANJNkRaXAu1tBwA@mail.gmail.com> In-Reply-To: <202306201629.35KGTDxK044992@gitrepo.freebsd.org> References: <202306201629.35KGTDxK044992@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000eb09cd05fe96b84f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Jun 20, 2023 at 9:29=E2=80=AFAM John Baldwin <jhb@freebsd.org> wrot= e: > The branch main has been updated by jhb: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D2e2a1c8ecf639317f40cdb1c2a0c5b9= abe990e58 > > commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58 > Author: John Baldwin <jhb@FreeBSD.org> > AuthorDate: 2023-06-20 16:28:59 +0000 > Commit: John Baldwin <jhb@FreeBSD.org> > CommitDate: 2023-06-20 16:28:59 +0000 > > libgssapi: Remove set but unused variable. > > Reported by: GCC > --- > lib/libgssapi/gss_delete_sec_context.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/lib/libgssapi/gss_delete_sec_context.c > b/lib/libgssapi/gss_delete_sec_context.c > index 930f51399cce..b64e32c5dc2c 100644 > --- a/lib/libgssapi/gss_delete_sec_context.c > +++ b/lib/libgssapi/gss_delete_sec_context.c > @@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status, > gss_ctx_id_t *context_handle, > gss_buffer_t output_token) > { > - OM_uint32 major_status; > struct _gss_context *ctx =3D (struct _gss_context *) *context_han= dle; > > if (output_token) > @@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, > * otherwise fake an empty token. > */ > if (ctx->gc_ctx) { > - major_status =3D ctx->gc_mech->gm_delete_sec_cont= ext( > + (void) ctx->gc_mech->gm_delete_sec_context( > Looks like gcc was catching a latent bug here -- if we consult the corresponding heimdal implementation, major_status is initialized to GSS_S_COMPLETE but this assignment can override it, and the function itself returns major_status rather than a hardcoded GSS_S_COMPLETE. -Ben > minor_status, &ctx->gc_ctx, output_token)= ; > } > free(ctx); > > --000000000000eb09cd05fe96b84f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr">On Tue, Jun 20, 2023 at 9:29=E2=80=AFAM J= ohn Baldwin <<a href=3D"mailto:jhb@freebsd.org">jhb@freebsd.org</a>> = wrote:<br></div><div class=3D"gmail_quote"><blockquote class=3D"gmail_quote= " style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);= padding-left:1ex">The branch main has been updated by jhb:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3D2e2a1c8ecf639317f= 40cdb1c2a0c5b9abe990e58" rel=3D"noreferrer" target=3D"_blank">https://cgit.= FreeBSD.org/src/commit/?id=3D2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58</a><b= r> <br> commit 2e2a1c8ecf639317f40cdb1c2a0c5b9abe990e58<br> Author:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org><br> AuthorDate: 2023-06-20 16:28:59 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0John Baldwin <jhb@FreeBSD.org><br> CommitDate: 2023-06-20 16:28:59 +0000<br> <br> =C2=A0 =C2=A0 libgssapi: Remove set but unused variable.<br> <br> =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 GCC<br> ---<br> =C2=A0lib/libgssapi/gss_delete_sec_context.c | 3 +--<br> =C2=A01 file changed, 1 insertion(+), 2 deletions(-)<br> <br> diff --git a/lib/libgssapi/gss_delete_sec_context.c b/lib/libgssapi/gss_del= ete_sec_context.c<br> index 930f51399cce..b64e32c5dc2c 100644<br> --- a/lib/libgssapi/gss_delete_sec_context.c<br> +++ b/lib/libgssapi/gss_delete_sec_context.c<br> @@ -41,7 +41,6 @@ gss_delete_sec_context(OM_uint32 *minor_status,<br> =C2=A0 =C2=A0 =C2=A0gss_ctx_id_t *context_handle,<br> =C2=A0 =C2=A0 =C2=A0gss_buffer_t output_token)<br> =C2=A0{<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0OM_uint32 major_status;<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 struct _gss_context *ctx =3D (struct _gss_conte= xt *) *context_handle;<br> <br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (output_token)<br> @@ -54,7 +53,7 @@ gss_delete_sec_context(OM_uint32 *minor_status,<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0* otherwise f= ake an empty token.<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*/<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (ctx->gc_ctx)= {<br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0major_status =3D ctx->gc_mech->gm_delete_sec_context(<br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0(void) ctx->gc_mech->gm_delete_sec_context(<br> </blockquote><div><br></div><div>Looks like gcc was catching a latent bug h= ere -- if we consult the corresponding heimdal implementation, major_status= is initialized to GSS_S_COMPLETE but this assignment can override it, and = the function itself returns major_status rather than a hardcoded GSS_S_COMP= LETE.</div><div><br></div><div>-Ben</div><div><br></div><div>=C2=A0</div><b= lockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-le= ft:1px solid rgb(204,204,204);padding-left:1ex">=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 minor_status, &ctx->gc_ctx, output_token);<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 }<br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 free(ctx);<br> <br> </blockquote></div></div> --000000000000eb09cd05fe96b84f--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ5_RoAO-MK8vbPQwg_pmK3CT1JULhgVzVSANJNkRaXAu1tBwA>