diff options
author | Hans de Goede <hdegoede@redhat.com> | 2008-11-05 11:20:45 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2008-11-05 11:20:45 +0100 |
commit | 04c33a7179b48115afa1a0c01d2a83bdc4b7cfef (patch) | |
tree | c1b0b61731ddf0e42a88a66e597b1d56eb04518e | |
parent | 1ef0b0111941ef91d40cfcfe868b6b5f5471258a (diff) | |
download | anaconda-04c33a7179b48115afa1a0c01d2a83bdc4b7cfef.tar.gz anaconda-04c33a7179b48115afa1a0c01d2a83bdc4b7cfef.tar.xz anaconda-04c33a7179b48115afa1a0c01d2a83bdc4b7cfef.zip |
Use struct audit_reply instead of struct auditd_reply_list (#469873)
libaudit header files no longer define struct audit_reply in 1.7.x, this fixes
building anaconda with audit-libs 1.7.x, backport of commit
03632989910557d955c1b5362c401addc62d0146
by dcantrell
-rw-r--r-- | isys/auditd.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/isys/auditd.c b/isys/auditd.c index f2920e0c1..cc86f31ee 100644 --- a/isys/auditd.c +++ b/isys/auditd.c @@ -40,7 +40,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 = { @@ -70,10 +70,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); @@ -82,7 +79,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. */ ; } |