[PATCH 1/2] Revert "In auditctl, when resetting lost request status output afterwards"

[Richard Guy Briggs]

On 2017-11-27 17:16, Steve Grubb wrote:
> On Wednesday, November 22, 2017 7:00:56 PM EST Richard Guy Briggs wrote:
> > This reverts commit 56a708761347ba49ccdc2378d31133f01129f4f2.
> > 
> > Conflicts:
> > 	ChangeLog
> > ---
> >  ChangeLog      | 1 +
> >  src/auditctl.c | 7 ++++---
> >  2 files changed, 5 insertions(+), 3 deletions(-)
> > 
> > diff --git a/ChangeLog b/ChangeLog
> > index de9ae56..4e9ca3d 100644
> > --- a/ChangeLog
> > +++ b/ChangeLog
> > @@ -4,6 +4,7 @@
> >  - In auditctl, when resetting lost request status output afterwards
> >  - AVC report from aureport was missing result column header (#1511606)
> >  - Add SOFTWARE_UPDATE event
> > +- REVERT: In auditctl, when resetting lost request status output afterwards
> 
> Applied. But its best not to mess with the Changelog because there is no 
> guarantee this patch goes in before other work.  As it turns out, it failed to 
> apply and then I deleted this chunk and everything was OK.

Ok, so I should have just added a Changelog entry to quote the previous
one, reverting it?

> -Steve
> 
> >  2.8.1
> >  - Fix NULL ptr dereference in audispd plugin_dir parser
> > diff --git a/src/auditctl.c b/src/auditctl.c
> > index 0b301c1..a1c05b5 100644
> > --- a/src/auditctl.c
> > +++ b/src/auditctl.c
> > @@ -1064,9 +1064,10 @@ process_keys:
> >  #endif
> >  		break;
> >  	case 3:
> > -		if ((rc = audit_reset_lost(fd)) >= 0)
> > -			audit_request_status(fd);
> > -		else {
> > +		if ((rc = audit_reset_lost(fd)) >= 0) {
> > +			audit_msg(LOG_INFO, "lost: %u", rc);
> > +			return -2;
> > +		} else {
> >  			audit_number_to_errmsg(rc, long_opts[lidx].name);
> >  			retval = -1;
> >  		}

- RGB

--
Richard Guy Briggs <rgb at redhat.com>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635