Thread: [Aide-commits] aide branch, master, updated. bf287d28234730d3348e17f73a8b3dc2471fa527
Brought to you by:
hvhaugwitz,
rvdb
From: Hannes v. H. <hvh...@us...> - 2010-07-21 18:01:07
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "aide". The branch, master has been updated via bf287d28234730d3348e17f73a8b3dc2471fa527 (commit) from 278d0e1d0b060b1ce539517fe66fa1ca9e89a8a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bf287d28234730d3348e17f73a8b3dc2471fa527 Author: Hannes von Haugwitz <ha...@vo...> Date: Wed Jul 21 19:47:43 2010 +0200 Made length of summary string dynamic diff --git a/ChangeLog b/ChangeLog index e3408f5..946fe51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 2010-07-21 Hannes von Haugwitz <ha...@vo...> + * summarize_changes: made length of summary string dynamic * Always save the inode to database (needed for DB_CHECKINODE) * Documented ftype and e2fsattrs in aide.conf * Added TFTYPE token diff --git a/doc/aide.conf.5.in b/doc/aide.conf.5.in index 3b30f40..469f928 100644 --- a/doc/aide.conf.5.in +++ b/doc/aide.conf.5.in @@ -105,6 +105,13 @@ An \fBi\fP means that the inode has changed. A \fBn\fP means that the link count has changed. .IP o A \fBC\fP means that one or more checksums have changed. +.RE + +.RS +The following letters are only available when explicitly enabled using configure: +.RE + +.RS .IP o A \fBA\fP means that the access control list has changed. .IP o diff --git a/src/compare_db.c b/src/compare_db.c index 9e09e35..b84ca9f 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -319,7 +319,6 @@ DB_ATTR_TYPE compare_dbline(db_line* l1,db_line* l2,DB_ATTR_TYPE ignorelist) } \ } - DB_ATTR_TYPE ret=0; if (!(DB_FTYPE&ignorelist)) { @@ -765,6 +764,8 @@ void print_changed_line(db_line* old,db_line* new, DB_ATTR_TYPE ignorelist) { } \ } else if (a&new->attr) { \ summary[d]='+'; \ + } else { \ + summary[d]=' '; \ } #define easy_char(a,b,c,d) \ @@ -782,10 +783,27 @@ void print_changed_line(db_line* old,db_line* new, DB_ATTR_TYPE ignorelist) { } \ } else if (a&new->attr) { \ summary[d]='+'; \ + } else { \ + summary[d]=' '; \ } if(conf->summarize_changes==1) { - char summary[]=" "; + int offset = 0; + /* The length of the summary string depends on compiled groups */ + int summary_len = 14; +#ifdef WITH_ACL + summary_len++; +#endif +#ifdef WITH_XATTR + summary_len++; +#endif +#ifdef WITH_SELINUX + summary_len++; +#endif +#ifdef WITH_E2FSATTRS + summary_len++; +#endif + char* summary = malloc (summary_len * sizeof (char)); summary[0]= ((!(DB_FTYPE&ignorelist)) && (((DB_FTYPE&old->attr && DB_FTYPE&new->attr) && get_file_type_char(old->perm)!=get_file_type_char(new->perm)))) ? '!' : get_file_type_char(new->perm); @@ -880,17 +898,26 @@ void print_changed_line(db_line* old,db_line* new, DB_ATTR_TYPE ignorelist) { #endif ) { summary[12]='.'; + } else { + summary[12]=' '; } + #ifdef WITH_ACL - easy_compare_char(DB_ACL,compare_acl(old->acl,new->acl)==RETFAIL,'A',13); + easy_compare_char(DB_ACL,compare_acl(old->acl,new->acl)==RETFAIL,'A',13+offset++); +#endif +#ifdef WITH_XATTR + easy_compare_char(DB_XATTRS,compare_xattrs(old->xattrs,new->xattrs)==RETFAIL,'X',13+offset++); +#endif +#ifdef WITH_SELINUX + easy_compare_char(DB_SELINUX,str_has_changed(old->cntx,new->cntx),'S',13+offset++); #endif - easy_compare_char(DB_XATTRS,compare_xattrs(old->xattrs,new->xattrs)==RETFAIL,'X',14); - easy_compare_char(DB_SELINUX,str_has_changed(old->cntx,new->cntx),'S',15); - #ifdef WITH_E2FSATTRS - easy_char(DB_E2FSATTRS,e2fsattrs,'E',16); + easy_char(DB_E2FSATTRS,e2fsattrs,'E',13+offset++); #endif + summary[13+offset]='\0'; error(2,"%s: %s\n",summary, new->filename); + free(summary); + summary=NULL; } else { error(2,"changed: %s\n",new->filename); } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + doc/aide.conf.5.in | 7 +++++++ src/compare_db.c | 41 ++++++++++++++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 7 deletions(-) hooks/post-receive -- aide |