Re: PATCH RHEL5 make isys/auditd.c build with latest RHEL5 nightly audit-libs-devel

[Joel Granados <jgranado redhat com>]

----- "Hans de Goede" <hdegoede redhat com> wrote:

> Hi all,
> 
> Current rhel5-branch does not build against the latest
> audit-libs-devel from 
> the rhel5 nightly's.
> 
> I don't know how brew exactly works, but I guess it will use the
> latest 
> audit-libs-devel next time we try to build anaconda, if it does we
> will need 
> the attached patch (extracted from the master branch).
> 

If you are in dire need of a library, that is not in the brew builders you should contact rel-eng.  They will waive their magic wand and make the library magically appear :)
I don't know what will happen if you wait.  I'm guessing that the build wont happen.  I've always bothered rel-eng for this.

Regards

> Regards,
> 
> Hans
> 
> From: David Cantrell <dcantrell redhat com>
> Date: Sun, 7 Sep 2008 08:43:59 +0000 (-1000)
> Subject: Use struct audit_reply instead of struct auditd_reply_list
> X-Git-Tag: anaconda-11.4.1.32-1~1
> X-Git-Url:
> http://git.fedorahosted.org/git/?p=anaconda.git;a=commitdiff_plain;h=03632989910557d955c1b5362c401addc62d0146
> 
> Use struct audit_reply instead of struct auditd_reply_list
> 
> libaudit API changed a bit.  Only have audit_reply now, and
> not auditd_reply_list.
> ---
> 
> diff --git a/isys/auditd.c b/isys/auditd.c
> index 971640f..bbc6267 100644
> --- a/isys/auditd.c
> +++ b/isys/auditd.c
> @@ -44,7 +44,7 @@ static void sig_done(int sig)
>  }
>  
>  static void do_auditd(int fd) {
> -    struct auditd_reply_list *rep = NULL;
> +    struct audit_reply rep;
>      sigset_t sigs;
>      struct sigaction sa;
>      struct pollfd pds = {
> @@ -74,10 +74,7 @@ static void do_auditd(int fd) {
>          struct timespec timeout = { -1, -1 };
>          int retval;
>  
> -        if (rep == NULL) {
> -            if (!(rep = calloc(1, sizeof (*rep))))
> -                return;
> -        }
> +        memset(&rep, 0, sizeof(rep));
>  
>          do {
>              retval = ppoll(&pds, 1, &timeout, &sigs);
> @@ -86,7 +83,7 @@ static void do_auditd(int fd) {
>          if (done)
>              break;
>  
> -        if (audit_get_reply(fd, &rep->reply, GET_REPLY_NONBLOCKING,
> 0) > 0) {
> +        if (audit_get_reply(fd, &rep, GET_REPLY_NONBLOCKING, 0) > 0)
> {
>              /* we don't actually want to do anything here. */
>              ;
>          }
> 
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list redhat com
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list

-- 
Joel Andres Granados
Red Hat / Brno Czech Republic