- Use upstream's patch to fix bz 590566

This commit is contained in:
Steve Grubb 2010-05-18 14:52:48 +00:00
parent 4dc073ba8d
commit 4255ca5492
2 changed files with 16 additions and 15 deletions

View File

@ -1,14 +1,12 @@
diff -urp aide-0.14.orig/src/gen_list.c aide-0.14/src/gen_list.c
--- aide-0.14.orig/src/gen_list.c 2010-05-15 10:32:49.000000000 -0400
+++ aide-0.14/src/gen_list.c 2010-05-15 13:10:08.000000000 -0400
@@ -1007,7 +1007,9 @@ void strip_dbline(db_line* line,DB_ATTR_
if(!(attr&DB_LINKNAME)){
checked_free(line->linkname);
}
- /* permissions are always needed for summarize_changes, hence it is never stripped */
+ if(!(attr&DB_PERM)){
+ line->perm=0;
+ }
if(!(attr&DB_UID)){
line->uid=0;
}
diff -urp aide-0.14.orig/src/compare_db.c aide-0.14/src/compare_db.c
--- aide-0.14.orig/src/compare_db.c 2010-05-15 10:32:49.000000000 -0400
+++ aide-0.14/src/compare_db.c 2010-05-18 10:47:46.000000000 -0400
@@ -317,7 +317,7 @@ DB_ATTR_TYPE compare_dbline(db_line* l1,
easy_compare(DB_BCOUNT,bcount);
if (!(DB_PERM&ignorelist)) {
- if(l1->perm!=l2->perm){
+ if (DB_PERM&l1->attr && DB_PERM&l2->attr && l1->perm!=l2->perm) {
ret|=DB_PERM;
}
} else {

View File

@ -4,7 +4,7 @@
Summary: Intrusion detection environment
Name: aide
Version: 0.14
Release: 3%{?dist}
Release: 4%{?dist}
URL: http://sourceforge.net/projects/aide
License: GPLv2+
Group: Applications/System
@ -89,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue May 18 2010 Steve Grubb <sgrubb@redhat.com> - 0.14-4
- Use upstream's patch to fix bz 590566
* Sat May 15 2010 Steve Grubb <sgrubb@redhat.com> - 0.14-3
- Fix bz 590561 aide does not detect the change of SElinux context
- Fix bz 590566 aide reports a changed file when it has not been changed