Thread: [Aide-commits] aide branch, master, updated. aide.0.15.1.release-39-g9d49ef3
Brought to you by:
hvhaugwitz,
rvdb
From: Hannes v. H. <hvh...@us...> - 2010-12-27 15:40:45
|
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 9d49ef3e55e3e266964f20b2b4a4bbd24589f231 (commit) from c863a020775cd4e9d631cfb43c478920e2c2f0e4 (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 9d49ef3e55e3e266964f20b2b4a4bbd24589f231 Author: Hannes von Haugwitz <ha...@vo...> Date: Mon Dec 27 16:29:13 2010 +0100 src/compare_db.c: removed obsolete code diff --git a/ChangeLog b/ChangeLog index f810489..a74b039 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ changed attributes - print added or removed attributes of changed entries if forced via report_attributes + - removed obsolete code 2010-12-26 Hannes von Haugwitz <ha...@vo...> * src/compare_db.c: diff --git a/src/compare_db.c b/src/compare_db.c index c7f4cbc..b9640b0 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -51,18 +51,9 @@ /*************/ /* construction area for report lines */ -const int old_col = 12; -const int new_col = 40; int width_details = 80; -const int part_len = 33; /* usable length of line[] for most purposes */ -const int long_part_len = 129; /* length of line[] for link names and selinux contexts */ -char oline[129]; -char nline[129]; -const char* entry_format= " %-9s: %-33s, %s\n"; -const char* entry_format_justnew=" %-9s: %-33c %s\n"; - const char* report_top_format = "\n---------------------------------------------------\n%s:\n---------------------------------------------------\n\n"; const DB_ATTR_TYPE summary_attributes[] = { DB_FTYPE, DB_LINKNAME, DB_SIZE|DB_SIZEG, DB_BCOUNT, DB_PERM, DB_UID, DB_GID, DB_ATIME, DB_MTIME, DB_CTIME, DB_INODE, DB_LNKCOUNT, DB_HASHES @@ -151,127 +142,6 @@ static DB_ATTR_TYPE get_report_attributes() { return forced_attrs==DB_ATTR_UNDEF?0:forced_attrs; } -#ifdef WITH_POSIX_ACL -int compare_acl(acl_type* a1,acl_type* a2) -{ - if (a1==NULL && a2==NULL) { - return RETOK; - } - if (a1==NULL || a2==NULL) { - return RETFAIL; - } - - if (!a1->acl_a != !a2->acl_a) { - return RETFAIL; - } - if (!a1->acl_d != !a2->acl_d) { - return RETFAIL; - } - - if (a1->acl_a && strcmp(a1->acl_a, a2->acl_a)) - return RETFAIL; - if (a1->acl_d && strcmp(a1->acl_d, a2->acl_d)) - return RETFAIL; - - return RETOK; -} -#endif - -#ifdef WITH_SUN_ACL -static int compare_single_acl(aclent_t* a1,aclent_t* a2) { - if (a1->a_type!=a2->a_type || - a1->a_id!=a2->a_id || - a1->a_perm!=a2->a_perm) { - return RETFAIL; - } - return RETOK; -} - -int compare_acl(acl_type* a1,acl_type* a2) { - - int i; - if (a1==NULL && a2==NULL) { - return RETOK; - } - if (a1==NULL || a2==NULL) { - return RETFAIL; - } - - if (a1->entries!=a2->entries) { - return RETFAIL; - } - /* Sort em up. */ - aclsort(a1->entries,0,a1->acl); - aclsort(a2->entries,0,a2->acl); - for(i=0;i<a1->entries;i++){ - if (compare_single_acl(a1->acl+i,a2->acl+i)==RETFAIL) { - return RETFAIL; - } - } - return RETOK; -} -#endif - -static int cmp_xattr_node(const void *c1, const void *c2) -{ - const xattr_node *x1 = c1; - const xattr_node *x2 = c2; - - return (strcmp(x1->key, x2->key)); -} - -int compare_xattrs(xattrs_type* x1,xattrs_type* x2) -{ - size_t num = 0; - - if (x1 && (x1->num == 0)) x1 = NULL; - if (x2 && (x2->num == 0)) x2 = NULL; - - if (x1==NULL && x2==NULL) { - return RETOK; - } - if (x1==NULL || x2==NULL) { - return RETFAIL; - } - - if (x1->num != x2->num) { - return RETFAIL; - } - - qsort(x1->ents, x1->num, sizeof(xattr_node), cmp_xattr_node); - qsort(x2->ents, x2->num, sizeof(xattr_node), cmp_xattr_node); - - while (num++ < x1->num) - { - const char *x1key = NULL; - const byte *x1val = NULL; - size_t x1vsz = 0; - const char *x2key = NULL; - const byte *x2val = NULL; - size_t x2vsz = 0; - - x1key = x1->ents[num - 1].key; - x1val = x1->ents[num - 1].val; - x1vsz = x1->ents[num - 1].vsz; - - x2key = x2->ents[num - 1].key; - x2val = x2->ents[num - 1].val; - x2vsz = x2->ents[num - 1].vsz; - - if (strcmp(x1key, x2key) || - x1vsz != x2vsz || - memcmp(x1val, x2val, x1vsz)) - return RETFAIL; - } - - return RETOK; -} - -static int bytecmp(byte *b1, byte *b2, size_t len) -{ - return strncmp((char *)b1, (char *)b2, len); -} - static char get_file_type_char(mode_t mode) { switch (mode & S_IFMT) { case S_IFREG: return 'f'; @@ -292,77 +162,7 @@ static char get_file_type_char(mode_t mode) { } } -void print_str_changes(char*old,char*new,const char *name, DB_ATTR_TYPE force) -{ - int mode = 0; - if(old==NULL){ - if(new!=NULL){ - snprintf(oline,long_part_len,"<NULL>"); - snprintf(nline,long_part_len,"%s",new); - mode = 1; - } - } else if(new==NULL){ - snprintf(oline,long_part_len,"%s",old); - snprintf(nline,long_part_len,"<NULL>"); - mode = 1; - } else if(strcmp(old,new)!=0){ - snprintf(oline,long_part_len,"%s",old); - snprintf(nline,long_part_len,"%s",new); - mode = 1; - } else if (force) { - snprintf(nline,long_part_len,"%s",new); - mode = 2; - } - if(mode == 1) { - error(2,(char*)entry_format,name,oline,nline); - } else if (mode == 2) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } - return; -} - -#ifdef WITH_ACL -void print_single_acl(acl_type* acl) -{ - if (acl==NULL) { - error(2,"<NULL>\n"); - } else { -#ifdef WITH_POSIX_ACL - if (!acl->acl_a) - error(2,"A: <NONE>\n "); - else - error(2,"A:\n----\n%s----\n ",acl->acl_a); - if (!acl->acl_d) - error(2,"D: <NONE>\n"); - else - error(2,"D:\n----\n%s----\n",acl->acl_d); -#endif -#ifdef WITH_SUN_ACL - char* aclt; - aclt=acltotext(acl->acl,acl->entries); - if (aclt==NULL) { - error(2,"ERROR\n"); - } else { - error(2,"%s ,\n",aclt); - free(aclt); - } -#endif - } -} -void print_acl_changes(acl_type* old,acl_type* new, DB_ATTR_TYPE force) { - - if (compare_acl(old,new)==RETFAIL) { - error(2," ACL : old = "); - print_single_acl(old); - error(2," new = "); - print_single_acl(new); - } else if (old!=NULL && new!=NULL && force) { - error(2," ACL : "); - print_single_acl(new); - } -} -#endif #ifdef WITH_XATTR static size_t xstrnspn(const char *s1, size_t len, const char *srch) @@ -412,59 +212,6 @@ static int xattrs2array(xattrs_type* xattrs, char* **values) { } return n; } - -void print_single_xattrs(xattrs_type* xattrs) -{ - if (xattrs==NULL) { - error(2,"num=0\n"); - } else { - size_t num = 0; - int width = 0; - - error(2,"num=%lu\n", (unsigned long)xattrs->num); - - width = log10(xattrs->num); /* make them the same width */ - - while (num++ < xattrs->num) - { - char *val = NULL; - size_t len = 0; - - val = (char *)xattrs->ents[num - 1].val; - - len = xstrnspn(val, xattrs->ents[num - 1].vsz, PRINTABLE_XATTR_VALS); - - if ((len == xattrs->ents[num - 1].vsz) || - ((len == (xattrs->ents[num - 1].vsz - 1)) && !val[len])) - error(2," [%.*zd] %s = %s\n", width, num, - xattrs->ents[num - 1].key, val); - else - { - val = encode_base64(xattrs->ents[num - 1].val, - xattrs->ents[num - 1].vsz); - error(2," [%.*zd] %s <=> %s\n", width, num, - xattrs->ents[num - 1].key, val); - free(val); - } - - } - } -} - -void print_xattrs_changes(xattrs_type* old,xattrs_type* new, - DB_ATTR_TYPE force) { - - if (compare_xattrs(old,new)==RETFAIL) { - error(2," XAttrs : old = "); - print_single_xattrs(old); - error(2," new = "); - print_single_xattrs(new); - } else if (force) { - error(2," XAttrs : "); - print_single_xattrs(new); - } - -} #endif #ifdef WITH_ACL @@ -517,125 +264,6 @@ static char* e2fsattrs2string(unsigned long flags) { } #endif -void print_md_changes(byte*old,byte*new,int len,char* name, DB_ATTR_TYPE force) -{ - int mode = 0; - if (old!=NULL && new!=NULL) { - if(bytecmp(old,new,len)!=0) { - snprintf(oline,part_len,"%s",encode_base64(old,len)); - snprintf(nline,part_len,"%s",encode_base64(new,len)); - mode = 1; - } else if (force) { - snprintf(nline,part_len,"%s",encode_base64(new,len)); - mode = 2; - } - } else if (old==NULL && new!=NULL) { - snprintf(oline,part_len,"<NONE>"); - snprintf(nline,part_len,"%s",encode_base64(new,len)); - mode = 1; - } else if (old!=NULL && new==NULL) { - snprintf(oline,part_len,"%s",encode_base64(old,len)); - snprintf(nline,part_len,"<NONE>"); - mode = 1; - } - if (mode == 1) { - error(2,(char*)entry_format,name,oline,nline); - } else if (mode == 2) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } - return; -} - -int is_time_null(struct tm *ot) -{ - /* 1970-01-01 01:00:00 is year null */ - return (ot->tm_year==70 && ot->tm_mon == 0 && ot->tm_mday == 1 - && ot->tm_hour == 1 && ot->tm_min == 0 && ot->tm_sec == 0); -} - -void print_time_changes(const char* name, time_t old_time, time_t new_time,int justnew) -{ - struct tm otm; - struct tm *ot = &otm; - struct tm *tmp = localtime(&old_time); - struct tm *nt; - - /* lib stores last tm call in static storage */ - ot->tm_year = tmp->tm_year; ot->tm_mon = tmp->tm_mon; - ot->tm_mday = tmp->tm_mday; ot->tm_hour = tmp->tm_hour; - ot->tm_min = tmp->tm_min; ot->tm_sec = tmp->tm_sec; - - nt = localtime(&(new_time)); - if (!justnew) { - if( is_time_null(ot) ) { - snprintf(oline,part_len,"<NONE>"); - } else { - snprintf(oline,part_len, - "%.4u-%.2u-%.2u %.2u:%.2u:%.2u", - ot->tm_year+1900, ot->tm_mon+1, ot->tm_mday, - ot->tm_hour, ot->tm_min, ot->tm_sec); - } - } - if( is_time_null(nt) ) { - snprintf(nline,part_len,"<NONE>"); - } else { - snprintf(nline,part_len, - "%.4u-%.2u-%.2u %.2u:%.2u:%.2u", - nt->tm_year+1900, nt->tm_mon+1, nt->tm_mday, - nt->tm_hour, nt->tm_min, nt->tm_sec); - } - if (justnew) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } else { - error(2,(char*)entry_format,name,oline,nline); - } -} - -void print_int_changes(const char* name, int old, int new, int justnew) -{ - if (!justnew) { - snprintf(oline,part_len,"%i",old); - } - snprintf(nline,part_len,"%i",new); - if (justnew) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } else { - error(2,(char*)entry_format,name,oline,nline); - } -} -void print_long_changes(const char* name, AIDE_OFF_TYPE old, AIDE_OFF_TYPE new, int justnew) -{ -#if SIZEOF_OFF64_T == SIZEOF_LONG_LONG - if (!justnew) { - snprintf(oline,part_len,"%llu",(long long unsigned)old); - } - snprintf(nline,part_len,"%llu",(long long unsigned)new); -#else - if (!justnew) { - snprintf(oline,part_len,"%lu",old); - } - snprintf(nline,part_len,"%lu",new); -#endif - if (justnew) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } else { - error(2,(char*)entry_format,name,oline,nline); - } -} - -void print_string_changes(const char* name, const char* old, const char* new, int justnew) -{ - if (!justnew) { - snprintf(oline,part_len,"%s",old); - } - snprintf(nline,part_len,"%s",new); - if (justnew) { - error(2,(char*)entry_format_justnew,name,' ',nline); - } else { - error(2,(char*)entry_format,name,oline,nline); - } -} - static char* get_file_type_string(mode_t mode) { switch (mode & S_IFMT) { case S_IFREG: return _("File"); @@ -656,22 +284,6 @@ static char* get_file_type_string(mode_t mode) { } } -int str_has_changed(char*old,char*new) -{ - return (((old!=NULL && new!=NULL) && - strcmp(old,new)!=0 ) && - (old!=NULL || new!=NULL)); -} - -int md_has_changed(byte*old,byte*new,int len) -{ - error(255,"Debug, md_has_changed %p %p\n",old,new); - return (((old!=NULL && new!=NULL) && - (bytecmp(old,new,len)!=0)) || - ((old!=NULL && new==NULL) || - (old==NULL && new!=NULL))); -} - static int get_attribute_values(DB_ATTR_TYPE attr, db_line* line, char* **values) { @@ -847,184 +459,6 @@ static void print_dbline_attributes(db_line* oline, db_line* nline, DB_ATTR_TYPE } } -void print_dbline_changes(db_line* old,db_line* new, - DB_ATTR_TYPE ignorelist,DB_ATTR_TYPE forced_attrs) -{ - char* tmp=NULL; - char* tmp2=NULL; - - /* - Force just entries, that exists. - */ - forced_attrs&=new->attr; - - error(2,"\n%s: %s\n",get_file_type_string(new->perm),new->filename); - - if ((!(DB_FTYPE&ignorelist)) && (((DB_FTYPE&old->attr && DB_FTYPE&new->attr) && get_file_type_char(old->perm)!=get_file_type_char(new->perm)) || DB_FTYPE&forced_attrs)) { - print_string_changes("File type", get_file_type_string(old->perm),get_file_type_string(new->perm), get_file_type_char(old->perm)==get_file_type_char(new->perm)); - } - - if(!(DB_LINKNAME&ignorelist)){ - print_str_changes(old->linkname,new->linkname, "Lname", DB_LINKNAME&forced_attrs); - } - - if (((!(DB_SIZEG&ignorelist)) && (((DB_SIZEG&old->attr && DB_SIZEG&new->attr) && old->size>new->size) || DB_SIZEG&forced_attrs)) - || ((!(DB_SIZE&ignorelist)) && (((DB_SIZE&old->attr && DB_SIZE&new->attr) && old->size!=new->size) || DB_SIZE&forced_attrs)) ) { - print_long_changes("Size", old->size,new->size,old->size==new->size); - } - - if (!(DB_BCOUNT&ignorelist)) { - if(old->bcount!=new->bcount ||(DB_BCOUNT&forced_attrs) ){ - print_int_changes("Bcount", old->bcount,new->bcount,old->bcount==new->bcount); - } - } - if (!(DB_PERM&ignorelist)) { - if((DB_PERM&old->attr && DB_PERM&new->attr && old->perm!=new->perm) || DB_PERM&forced_attrs){ - tmp=perm_to_char(old->perm); - tmp2=perm_to_char(new->perm); - print_string_changes("Perm", tmp,tmp2,old->perm==new->perm); - free(tmp); - free(tmp2); - tmp=NULL; - tmp2=NULL; - } - } - - if (!(DB_UID&ignorelist)) { - if(old->uid!=new->uid||DB_UID&forced_attrs){ - print_int_changes("Uid", old->uid,new->uid,old->uid==new->uid); - } - } - - if (!(DB_GID&ignorelist)) { - if(old->gid!=new->gid||DB_GID&forced_attrs){ - print_int_changes("Gid", old->gid,new->gid,old->gid==new->gid); - } - } - - if (!(DB_ATIME&ignorelist)) { - if(old->atime!=new->atime||DB_ATIME&forced_attrs){ - print_time_changes("Atime", old->atime, new->atime,old->atime==new->atime); - } - } - - if (!(DB_MTIME&ignorelist)) { - if(old->mtime!=new->mtime||DB_MTIME&forced_attrs){ - print_time_changes("Mtime", old->mtime, new->mtime,old->mtime==new->mtime); - } - } - - if (!(DB_CTIME&ignorelist)) { - if(old->ctime!=new->ctime||DB_CTIME&forced_attrs){ - print_time_changes("Ctime", old->ctime, new->ctime,old->ctime==new->ctime); - } - } - - if (!(DB_INODE&ignorelist)) { - if(((DB_INODE&old->attr && (DB_INODE&new->attr)) && old->inode!=new->inode) ||DB_INODE&forced_attrs){ - print_int_changes("Inode", old->inode,new->inode,old->inode==new->inode); - } - } - if (!(DB_LNKCOUNT&ignorelist)) { - if(old->nlink!=new->nlink||DB_LNKCOUNT&forced_attrs){ - print_int_changes("Linkcount", old->nlink,new->nlink,old->nlink==new->nlink); - } - } - - if (!(DB_MD5&ignorelist)) { - print_md_changes(old->md5,new->md5, - HASH_MD5_LEN, - "MD5", DB_MD5&forced_attrs); - } - - if (!(DB_SHA1&ignorelist)) { - print_md_changes(old->sha1,new->sha1, - HASH_SHA1_LEN, - "SHA1", DB_SHA1&forced_attrs); - } - - if (!(DB_RMD160&ignorelist)) { - print_md_changes(old->rmd160,new->rmd160, - HASH_RMD160_LEN, - "RMD160", DB_RMD160&forced_attrs); - } - - if (!(DB_TIGER&ignorelist)) { - print_md_changes(old->tiger,new->tiger, - HASH_TIGER_LEN, - "TIGER", DB_TIGER&forced_attrs); - } - - if (!(DB_SHA256&ignorelist)) { - print_md_changes(old->sha256,new->sha256, - HASH_SHA256_LEN, - "SHA256", DB_SHA256&forced_attrs); - } - - if (!(DB_SHA512&ignorelist)) { - print_md_changes(old->sha512,new->sha512, - HASH_SHA512_LEN, - "SHA512", DB_SHA512&forced_attrs); - } - -#ifdef WITH_MHASH - if (!(DB_CRC32&ignorelist)) { - print_md_changes(old->crc32,new->crc32, - HASH_CRC32_LEN, - "CRC32", DB_CRC32&forced_attrs); - } - - if (!(DB_HAVAL&ignorelist)) { - print_md_changes(old->haval,new->haval, - HASH_HAVAL256_LEN, - "HAVAL", DB_HAVAL&forced_attrs); - } - - if (!(DB_GOST&ignorelist)) { - print_md_changes(old->gost,new->gost, - HASH_GOST_LEN, - "GOST", DB_GOST&forced_attrs); - } - - if (!(DB_CRC32B&ignorelist)) { - print_md_changes(old->crc32b,new->crc32b, - HASH_CRC32B_LEN, - "CRC32B", DB_CRC32B&forced_attrs); - } - - if (!(DB_WHIRLPOOL&ignorelist)) { - print_md_changes(old->whirlpool,new->whirlpool, - HASH_WHIRLPOOL_LEN, - "WHIRLPOOL", DB_WHIRLPOOL&forced_attrs); - } -#endif - -#ifdef WITH_ACL - if (!(DB_ACL&ignorelist)) { - print_acl_changes(old->acl,new->acl, DB_ACL&forced_attrs); - } -#endif - if (!(DB_XATTRS&ignorelist)) { - print_xattrs_changes(old->xattrs,new->xattrs, DB_XATTRS&forced_attrs); - } - if (!(DB_SELINUX&ignorelist)) { - print_str_changes(old->cntx,new->cntx, "SELinux", DB_SELINUX&forced_attrs); - } - -#ifdef WITH_E2FSATTRS - if ( !(DB_E2FSATTRS&ignorelist) ) { - if(old->e2fsattrs!=new->e2fsattrs || DB_E2FSATTRS&forced_attrs ) { - tmp=e2fsattrs2string(old->e2fsattrs); - tmp2=e2fsattrs2string(new->e2fsattrs); - print_string_changes("E2FSAttrs", tmp, tmp2, old->e2fsattrs==new->e2fsattrs); - free(tmp); free(tmp2); - tmp=NULL; tmp2=NULL; - } - } -#endif - - return; -} void print_report_header(int nfil,int nadd,int nrem,int nchg) { ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + src/compare_db.c | 566 ------------------------------------------------------ 2 files changed, 1 insertions(+), 566 deletions(-) hooks/post-receive -- aide |