From: <mva...@re...> - 2012-11-28 09:59:39
|
From: Miroslav Vadkerti <mva...@re...> After consultation with audit upstream developer we decided to accept both output of ANOM_RBAC_INTEGRITY_FAIL audit message, ie with/without colon. This small patch should be backward compatible with previous changes. Signed-off-by: Miroslav Vadkerti <mva...@re...> --- audit/trustedprograms/tests/test_aide_update.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/audit/trustedprograms/tests/test_aide_update.bash b/audit/trustedprograms/tests/test_aide_update.bash index 0ce8b28..6fd2c80 100755 --- a/audit/trustedprograms/tests/test_aide_update.bash +++ b/audit/trustedprograms/tests/test_aide_update.bash @@ -68,9 +68,8 @@ fi grep -q $modified aide.log || exit_fail "Modified file not found in aide.log" -msg1="added=0 removed=0 changed=1: exe=./usr/sbin/aide.*res=failed" +msg1="added=0 removed=0 changed=1[:]{0,1} exe=./usr/sbin/aide.*res=failed" augrok -q type=ANOM_RBAC_INTEGRITY_FAIL msg_1=~"${msg1}" || \ exit_fail "unable to find audit record containing $msg1" exit_pass - -- 1.7.11.7 |
From: Linda K. <lin...@hp...> - 2012-11-28 15:00:34
|
Looks good. -- ljk mva...@re... wrote: > From: Miroslav Vadkerti <mva...@re...> > > After consultation with audit upstream developer we decided > to accept both output of ANOM_RBAC_INTEGRITY_FAIL audit message, ie > with/without colon. This small patch should be backward compatible > with previous changes. > > Signed-off-by: Miroslav Vadkerti <mva...@re...> > --- > audit/trustedprograms/tests/test_aide_update.bash | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/audit/trustedprograms/tests/test_aide_update.bash b/audit/trustedprograms/tests/test_aide_update.bash > index 0ce8b28..6fd2c80 100755 > --- a/audit/trustedprograms/tests/test_aide_update.bash > +++ b/audit/trustedprograms/tests/test_aide_update.bash > @@ -68,9 +68,8 @@ fi > > grep -q $modified aide.log || exit_fail "Modified file not found in aide.log" > > -msg1="added=0 removed=0 changed=1: exe=./usr/sbin/aide.*res=failed" > +msg1="added=0 removed=0 changed=1[:]{0,1} exe=./usr/sbin/aide.*res=failed" > augrok -q type=ANOM_RBAC_INTEGRITY_FAIL msg_1=~"${msg1}" || \ > exit_fail "unable to find audit record containing $msg1" > > exit_pass > - |
From: Miroslav V. <mva...@re...> - 2012-11-28 17:58:43
|
Thanks Linda! This patch is now upstream ----- Original Message ----- > Looks good. > > -- ljk > > mva...@re... wrote: > > From: Miroslav Vadkerti <mva...@re...> > > > > After consultation with audit upstream developer we decided > > to accept both output of ANOM_RBAC_INTEGRITY_FAIL audit message, ie > > with/without colon. This small patch should be backward compatible > > with previous changes. > > > > Signed-off-by: Miroslav Vadkerti <mva...@re...> > > --- > > audit/trustedprograms/tests/test_aide_update.bash | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/audit/trustedprograms/tests/test_aide_update.bash > > b/audit/trustedprograms/tests/test_aide_update.bash > > index 0ce8b28..6fd2c80 100755 > > --- a/audit/trustedprograms/tests/test_aide_update.bash > > +++ b/audit/trustedprograms/tests/test_aide_update.bash > > @@ -68,9 +68,8 @@ fi > > > > grep -q $modified aide.log || exit_fail "Modified file not found > > in aide.log" > > > > -msg1="added=0 removed=0 changed=1: > > exe=./usr/sbin/aide.*res=failed" > > +msg1="added=0 removed=0 changed=1[:]{0,1} > > exe=./usr/sbin/aide.*res=failed" > > augrok -q type=ANOM_RBAC_INTEGRITY_FAIL msg_1=~"${msg1}" || \ > > exit_fail "unable to find audit record containing $msg1" > > > > exit_pass > > - > > -- Miroslav Vadkerti :: Quality Assurance Engineer / RHCE :: BaseOS QE - Security Phone +420 532 294 129 :: CR cell +420 775 039 842 :: SR cell +421 904 135 440 IRC mvadkert at #qe #urt #brno #rpmdiff :: GnuPG ID 0x25881087 at pgp.mit.edu Red Hat s.r.o, Purkyňova 99/71, 612 45, Brno, Czech Republic |