On Wed, Oct 16, 2024 at 1:53 PM Petr Lautrbach <lautrbach@xxxxxxxxxx> wrote:
>
> Stephen Smalley <stephen.smalley.work@xxxxxxxxx> writes:
>
> > It was originally marked for deprecation back in Feb 2020,
> > commit a41dfeb55d43 ("libselinux: deprecate security_compute_user(),
> > update man pages"), but the attribute was not added at the time.
> >
> > Signed-off-by: Stephen Smalley <stephen.smalley.work@xxxxxxxxx>
>
> Acked-by: Petr Lautrbach <lautrbach@xxxxxxxxxx>
Merge.
Thanks,
Jim
>
>
> > ---
> > libselinux/include/selinux/selinux.h | 6 ++++++
> > libselinux/src/compute_user.c | 2 ++
> > 2 files changed, 8 insertions(+)
> >
> > diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h
> > index 1318a66a..50419a7c 100644
> > --- a/libselinux/include/selinux/selinux.h
> > +++ b/libselinux/include/selinux/selinux.h
> > @@ -263,9 +263,15 @@ extern int security_compute_member_raw(const char * scon,
> > * These interfaces are deprecated. Use get_ordered_context_list() or
> > * one of its variant interfaces instead.
> > */
> > +#ifdef __GNUC__
> > +__attribute__ ((deprecated))
> > +#endif
> > extern int security_compute_user(const char * scon,
> > const char *username,
> > char *** con);
> > +#ifdef __GNUC__
> > +__attribute__ ((deprecated))
> > +#endif
> > extern int security_compute_user_raw(const char * scon,
> > const char *username,
> > char *** con);
> > diff --git a/libselinux/src/compute_user.c b/libselinux/src/compute_user.c
> > index f55f945a..d4387aed 100644
> > --- a/libselinux/src/compute_user.c
> > +++ b/libselinux/src/compute_user.c
> > @@ -96,7 +96,9 @@ int security_compute_user(const char * scon,
> > if (selinux_trans_to_raw_context(scon, &rscon))
> > return -1;
> >
> > + IGNORE_DEPRECATED_DECLARATION_BEGIN
> > ret = security_compute_user_raw(rscon, user, con);
> > + IGNORE_DEPRECATED_DECLARATION_END
> >
> > freecon(rscon);
> > if (!ret) {
> > --
> > 2.40.1
>
>
