aide-commits Mailing List for aide (Page 4)
Brought to you by:
hvhaugwitz,
rvdb
This list is closed, nobody may subscribe to it.
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(27) |
Jul
(26) |
Aug
(19) |
Sep
(29) |
Oct
(3) |
Nov
(7) |
Dec
(14) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2011 |
Jan
|
Feb
(8) |
Mar
(7) |
Apr
(2) |
May
|
Jun
(1) |
Jul
(4) |
Aug
|
Sep
(25) |
Oct
(1) |
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
(4) |
Nov
|
Dec
|
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(2) |
Nov
(5) |
Dec
|
2016 |
Jan
|
Feb
(4) |
Mar
(8) |
Apr
(10) |
May
|
Jun
(1) |
Jul
(14) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(1) |
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: Hannes v. H. <hvh...@us...> - 2013-05-06 18:14:40
|
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 8919e59993d140b930112efb1c2dbbb50a2ddeeb (commit) from 7a460b9191c981134381b965798984580838c2c8 (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 8919e59993d140b930112efb1c2dbbb50a2ddeeb Author: Hannes von Haugwitz <ha...@vo...> Date: Mon May 6 20:07:09 2013 +0200 Fixed return value of database initialization diff --git a/ChangeLog b/ChangeLog index c97319b..0ac55f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-05-06 Hannes von Haugwitz <ha...@vo...> + * src/compare_db.c: + - fixed return value of database initialization + 2013-05-04 Hannes von Haugwitz <ha...@vo...> * src/compare_db.c: - changed minimum verbose level for printing the details diff --git a/src/compare_db.c b/src/compare_db.c index aa4fa02..f04da36 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -695,7 +695,7 @@ int gen_report(seltree* node) { conf->end_time=time(&(conf->end_time)); print_report_footer(); - return (nadd!=0)*1+(nrem!=0)*2+(nchg!=0)*4; + return conf->action&(DO_COMPARE|DO_DIFF) ? (nadd!=0)*1+(nrem!=0)*2+(nchg!=0)*4 : 0; } const char* aide_key_9=CONFHMACKEY_09; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ src/compare_db.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2013-05-04 20:21:47
|
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 annotated tag, v0.16a2 has been created at 121fbe3633b586e0bd91bb7eaa4fecd4dd1b63ba (tag) tagging 7a460b9191c981134381b965798984580838c2c8 (commit) replaces v0.16a1 tagged by Hannes von Haugwitz on Sat May 4 21:52:42 2013 +0200 - Log ----------------------------------------------------------------- Released version 0.16a2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQGcBAABCAAGBQJRhWcLAAoJEBjuhjhgIu9Xx9UL/2CRu58kW6Q4f+JtyL8rnzvz Dzij6AwTek6Ik4klvcGHGflkoa43mCuri42iMIy36gk2SEYnuZsAZrAFiWfqSSwN 3kY9edrc5FJmc+uXw5fb2jpQ5UT0K4VlTSKTezGK5Zeu2mOg4kKE95PlmyUiWObB Hbt8bVwb8J7obD2RMtRBvZVSkM7y3hkCiRrMXrustR1+2EHllQOyitxXNQnLWhMH iFu9Bll4WhddAcBFN80iSODVPQVyg3qs0et+8Z4sBGWyTUKKuIEQaE+N0+3tVxUv IN31qfkBchEq1uZ3DToPyMTAKAsGMEVOIP8Oro82eGCBv8VC5LK05vls97xXRHpi wkib1VKOgkq4wDQwyhjE2b8gGLqOxHdrZRZQookQjdWVQfHldAqogulgSrNaE+pS QtgG3CnB2oBwKG8VRHVy+hj4P4+VS9pp/FAJCVVxGpn/jDHoyafro/eDI2q1WnHL epMRzY4qgrmTs0GrleqIDBeK29wI2va6ubDBGwr6lg== =Vo9H -----END PGP SIGNATURE----- Hannes von Haugwitz (51): Use 'git describe' for versioning Added mkdailyrelease.sh to contrib/ Removed contrib/mkgitsnapshot.sh s/db_disk.c: fixed handling of "/" directory inode src/db_disk.c: got rid of some static variables s/compare_db.c: print "End timestamp" message s/compare_db.c: made ignored_attrs and forced_attrs global src/compare_db.c: added run time to report src/compare_db.c: rewrote gen_report function s/gen_list.c: fixed wrong total number of entries AUTHORS: changed Pablo's mail address src/gen_list.c: fixed has_str_changed function src/util.c: fixed bad free of hostname variable src/db_file.c: removed dead code Updated copyright notices NEWS: mentioned 4a321bc s/gen_list.c: report added files in DO_INIT mode i/gen_list.h, s/gen_list.c: removed unused functions Added new root_prefix option s/do_md.c: removed unused function src/commandconf.c: added missing spaces ChangeLog: documented 9e53fb4 src/aide.c: added missing #include <dirent.h> Removed execute bit from some source files Fixed format of 8 bytes off_t type ChangeLog: Reformatted last entries i/aide.h,s/aide.c: declared static functions static src/be.c: declared static functions static src/commandconf.c: fixed compiler warning s/compare_db.c: fixed some compiler warnings src/db.c: fixed compiler warnings Fixed 'unused-parameter' compiler warning i/db_disk.h,s/db_disk.c: removed unused functions src/db_file.c: fixed compiler warnings Call acl2line only if WITH_ACL is defined Moved selinux2line function to src/do_md.c Moved xattrs2line function to src/do_md.c Declare db_writeacl only if WITH_ACL is defined Fixed 'undef' compiler warnings Added new detailed_init_report option src/db_file.c: added missing format string Removed auto-generated INSTALL file from repository s/compare_db.c: support older versions of e2fsprogs Added new report_base16 option src/gen_list.c: fixed handling of renamed files Added new default group X s/gen_list.c: fixed stripping of removed attributes src/compare_db.c: changed verbose levels Updated copyright notice README: updated "Source Code Verification" section Released version 0.16a2 Rami Lehti (1): Changed verbosity levels to ease debugging ----------------------------------------------------------------------- hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2013-05-04 20:20:36
|
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 7a460b9191c981134381b965798984580838c2c8 (commit) from dc5bac75520e58ac661dad4c6d80c0b0bc179d8a (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 7a460b9191c981134381b965798984580838c2c8 Author: Hannes von Haugwitz <ha...@vo...> Date: Sat May 4 20:31:54 2013 +0200 Released version 0.16a2 diff --git a/ChangeLog b/ChangeLog index 8754eb5..c97319b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ about added and removed entries to 7 * README: - updated "Source Code Verification" section + * Released version 0.16a2 2012-10-10 Hannes von Haugwitz <ha...@vo...> * Added new default group X diff --git a/README b/README index e54ebe9..b90e445 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ AIDE - Advanced Intrusion Detection Environment ------------------------------------------------- - Version 0.16a1 + Version 0.16a2 This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/doc/manual.html b/doc/manual.html index c03f70b..1bf1238 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -1,5 +1,5 @@ <html> -<head><title>AIDE Manual version 0.16a1</title> +<head><title>AIDE Manual version 0.16a2</title> <meta name="cvsheader" content=" $Id$ "> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + README | 2 +- doc/manual.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2013-05-04 18:21:40
|
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 dc5bac75520e58ac661dad4c6d80c0b0bc179d8a (commit) from 07a957cd3990c08de9dea816e9d2490905cac6f6 (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 dc5bac75520e58ac661dad4c6d80c0b0bc179d8a Author: Hannes von Haugwitz <ha...@vo...> Date: Sat May 4 19:55:19 2013 +0200 README: updated "Source Code Verification" section diff --git a/ChangeLog b/ChangeLog index 2cdb76c..8754eb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * src/compare_db.c: - changed minimum verbose level for printing the details about added and removed entries to 7 + * README: + - updated "Source Code Verification" section 2012-10-10 Hannes von Haugwitz <ha...@vo...> * Added new default group X diff --git a/README b/README index 933ae6d..e54ebe9 100644 --- a/README +++ b/README @@ -86,17 +86,16 @@ $ git verify-tag v<VERSION_NUMBER> - The key used to create this signature is: + The current public key needed for signature verification is: - pub 4096R/F4474E5A 2011-01-30 [expires: 2012-01-31] - uid Aide Developers <aid...@li...> + pub 4096R/68E7B931 2011-06-28 [expires: 2017-06-26] + uid Hannes von Haugwitz <ha...@vo...> - If you do not have this key, you can get it from the SourceForge - web site or from one of the well known PGP key servers. You have - to make sure that the key you install is not a faked one. You can - do this with reasonable assurance by comparing the output of: + If you do not have this key, you can get it from one of the well known PGP + key servers. You have to make sure that the key you install is not a faked + one. You can do this with reasonable assurance by comparing the output of: - $ gpg --fingerprint 0xF4474E5A + $ gpg --fingerprint 0x68E7B931 with the fingerprint published elsewhere. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ README | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2013-05-04 14:30:27
|
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 07a957cd3990c08de9dea816e9d2490905cac6f6 (commit) from 360e03c492bb920426b4d59c46b0a4bdc105a5ea (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 07a957cd3990c08de9dea816e9d2490905cac6f6 Author: Hannes von Haugwitz <ha...@vo...> Date: Sat May 4 16:28:47 2013 +0200 Updated copyright notice diff --git a/src/compare_db.c b/src/compare_db.c index 82e2ff5..aa4fa02 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2007,2010,2011,2013 Rami Lehti, Pablo Virolainen, + * Copyright (C) 1999-2007,2010-2013 Rami Lehti, Pablo Virolainen, * Richard van den Berg, Mike Markley, Hannes von Haugwitz * $Id$ * ----------------------------------------------------------------------- Summary of changes: src/compare_db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2013-05-04 14:22:18
|
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 360e03c492bb920426b4d59c46b0a4bdc105a5ea (commit) from 10e4ec0bce2741563d523e653521be1cec81df8f (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 360e03c492bb920426b4d59c46b0a4bdc105a5ea Author: Hannes von Haugwitz <ha...@vo...> Date: Sat May 4 16:09:03 2013 +0200 src/compare_db.c: changed verbose levels diff --git a/ChangeLog b/ChangeLog index 7f08d55..2cdb76c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-04 Hannes von Haugwitz <ha...@vo...> + * src/compare_db.c: + - changed minimum verbose level for printing the details + about added and removed entries to 7 + 2012-10-10 Hannes von Haugwitz <ha...@vo...> * Added new default group X * src/gen_list.c: fixed stripping of removed attributes diff --git a/NEWS b/NEWS index 379fd6f..88d70dd 100644 --- a/NEWS +++ b/NEWS @@ -9,7 +9,7 @@ Version 0.16 (NOT_YET_RELEASED) * Use '|' to separate the old value from the new one * Print added or removed attributes of changed entries if forced via report_attributes - * Print details about added and removed entries in verbose level 6 + * Print details about added and removed entries in verbose level 7 or higher * Print added and removed attribute values of changed entries in verbose level 6 or higher diff --git a/src/compare_db.c b/src/compare_db.c index 8c15dc0..82e2ff5 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2007,2010,2011 Rami Lehti, Pablo Virolainen, + * Copyright (C) 1999-2007,2010,2011,2013 Rami Lehti, Pablo Virolainen, * Richard van den Berg, Mike Markley, Hannes von Haugwitz * $Id$ * @@ -558,7 +558,7 @@ static void print_report_details(seltree* node) { if (conf->verbose_level>=5) { if (node->checked&NODE_CHANGED) { print_dbline_attributes(node->old_data, node->new_data, node->changed_attrs, (conf->verbose_level>=6?(((node->old_data)->attr)^((node->new_data)->attr)):0)|forced_attrs); - } else if ((conf->verbose_level>=6)) { + } else if ((conf->verbose_level>=7)) { if (node->checked&NODE_ADDED) { print_attributes_added_node(node->new_data); } if (node->checked&NODE_REMOVED) { print_attributes_removed_node(node->old_data); } } @@ -688,7 +688,7 @@ int gen_report(seltree* node) { print_report_list(node, NODE_ADDED|NODE_REMOVED|NODE_CHANGED); } if (nadd || nrem || nchg) { - error(nchg?5:6,(char*)report_top_format,_("Detailed information about changes")); + error(nchg?5:7,(char*)report_top_format,_("Detailed information about changes")); print_report_details(node); } } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++++ NEWS | 2 +- src/compare_db.c | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-10-10 06:43:58
|
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 10e4ec0bce2741563d523e653521be1cec81df8f (commit) from a7ada1e857294cfb2c3206a00a14b59816d85f5b (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 10e4ec0bce2741563d523e653521be1cec81df8f Author: Hannes von Haugwitz <ha...@vo...> Date: Wed Oct 10 08:08:54 2012 +0200 s/gen_list.c: fixed stripping of removed attributes diff --git a/ChangeLog b/ChangeLog index f3e3980..7f08d55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2012-10-10 Hannes von Haugwitz <ha...@vo...> * Added new default group X + * src/gen_list.c: fixed stripping of removed attributes 2012-10-08 Hannes von Haugwitz <ha...@vo...> * src/gen_list.c: fixed handling of renamed files diff --git a/src/gen_list.c b/src/gen_list.c index 1b21221..2cabc6e 100644 --- a/src/gen_list.c +++ b/src/gen_list.c @@ -675,10 +675,12 @@ seltree* gen_tree(list* prxlist,list* nrxlist,list* erxlist) * strip_dbline() * strips given dbline */ -void strip_dbline(db_line* line,DB_ATTR_TYPE attr) +void strip_dbline(db_line* line) { #define checked_free(x) do { free(x); x=NULL; } while (0) + DB_ATTR_TYPE attr = line->attr; + /* filename is always needed, hence it is never stripped */ if(!(attr&DB_LINKNAME)){ checked_free(line->linkname); @@ -805,7 +807,7 @@ void add_file_to_tree(seltree* tree,db_line* file,int db,int status, node->attr=attr; - strip_dbline(file,attr); + strip_dbline(file); switch (db) { case DB_OLD: { ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + src/gen_list.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-10-10 04:31:51
|
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 a7ada1e857294cfb2c3206a00a14b59816d85f5b (commit) from 86cabcb15c89b08266c91300a4e3c84aa95c6dc7 (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 a7ada1e857294cfb2c3206a00a14b59816d85f5b Author: Hannes von Haugwitz <ha...@vo...> Date: Wed Oct 10 06:06:19 2012 +0200 Added new default group X diff --git a/ChangeLog b/ChangeLog index e3c03a5..f3e3980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-10-10 Hannes von Haugwitz <ha...@vo...> + * Added new default group X + 2012-10-08 Hannes von Haugwitz <ha...@vo...> * src/gen_list.c: fixed handling of renamed files - read in databases in one go diff --git a/NEWS b/NEWS index 51468a7..379fd6f 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ Version 0.16 (NOT_YET_RELEASED) * Changed report if aide found no changes * Added info about number of entries if aide found no changes or the database has been initialized + * Added new default group X * Bug fixes Version 0.15.1 diff --git a/doc/aide.conf.5.in b/doc/aide.conf.5.in index 3100622..ab578f2 100644 --- a/doc/aide.conf.5.in +++ b/doc/aide.conf.5.in @@ -253,15 +253,17 @@ Input is read from filedescriptor \fBnumber\fR or output is written to .IP "tiger: tiger checksum" .IP "haval: haval checksum" .IP "crc32: crc32 checksum" -.IP "R: p+ftype+i+l+n+u+g+s+m+c+md5" -.IP "L: p+ftype+i+l+n+u+g" +.IP "R: p+ftype+i+l+n+u+g+s+m+c+md5+X" +.IP "L: p+ftype+i+l+n+u+g+X" .IP "E: Empty group" -.IP ">: Growing logfile p+ftype+l+u+g+i+n+S" -.IP "And also the following if you have mhash support enabled" +.IP "X: acl+selinux+xattrs+e2fsattrs (if groups are explicitly enabled)" +.IP ">: Growing logfile p+ftype+l+u+g+i+n+S+X" +.LP +And also the following if you have mhash support enabled .IP "gost: gost checksum" .IP "whirlpool: whirlpool checksum" -.IP "The following are available and added to the default groups R, L and > -.IP "only when explicitly enabled using configure" +.LP +The following are available only when explicitly enabled using configure .IP "acl: access control list" .IP "selinux: selinux attributes" .IP "xattrs: extended attributes" diff --git a/src/aide.c b/src/aide.c index 8bd25f5..46181ea 100644 --- a/src/aide.c +++ b/src/aide.c @@ -248,7 +248,7 @@ static void setdefaults_before_config() char* urlstr=INITIALERRORSTO; url_t* u=NULL; char* s=(char*)malloc(sizeof(char)*MAXHOSTNAMELEN+1); - unsigned long long p; + DB_ATTR_TYPE X; /* Set up the hostname @@ -390,55 +390,33 @@ static void setdefaults_before_config() do_groupdef("e2fsattrs",DB_E2FSATTRS); #endif - p=0LLU; -#if defined(WITH_MHASH) || defined(WITH_GCRYPT) - p|=DB_MD5; -#endif + X=0LLU; #ifdef WITH_ACL - p|=DB_ACL; + X|=DB_ACL; #endif #ifdef WITH_SELINUX - p|=DB_SELINUX; + X|=DB_SELINUX; #endif #ifdef WITH_XATTR - p|=DB_XATTRS; + X|=DB_XATTRS; #endif #ifdef WITH_E2FSATTRS - p|=DB_E2FSATTRS; + X|=DB_E2FSATTRS; #endif - do_groupdef("R",DB_PERM|DB_FTYPE|DB_INODE|DB_LNKCOUNT|DB_UID|DB_GID|DB_SIZE| - DB_LINKNAME|DB_MTIME|DB_CTIME|p); - p=0LLU; -#ifdef WITH_ACL - p|=DB_ACL; -#endif -#ifdef WITH_SELINUX - p|=DB_SELINUX; -#endif -#ifdef WITH_XATTR - p|=DB_XATTRS; -#endif -#ifdef WITH_E2FSATTRS - p|=DB_E2FSATTRS; -#endif - do_groupdef("L",DB_PERM|DB_FTYPE|DB_INODE|DB_LNKCOUNT|DB_UID|DB_GID|DB_LINKNAME|p); - p=0LLU; -#ifdef WITH_ACL - p|=DB_ACL; -#endif -#ifdef WITH_SELINUX - p|=DB_SELINUX; -#endif -#ifdef WITH_XATTR - p|=DB_XATTRS; -#endif -#ifdef WITH_E2FSATTRS - p|=DB_E2FSATTRS; + do_groupdef("R",DB_PERM|DB_FTYPE|DB_INODE|DB_LNKCOUNT|DB_UID|DB_GID|DB_SIZE| + DB_LINKNAME|DB_MTIME|DB_CTIME +#if defined(WITH_MHASH) || defined(WITH_GCRYPT) + |DB_MD5 #endif + |X); + + do_groupdef("L",DB_PERM|DB_FTYPE|DB_INODE|DB_LNKCOUNT|DB_UID|DB_GID|DB_LINKNAME|X); + do_groupdef(">",DB_PERM|DB_FTYPE|DB_INODE|DB_LNKCOUNT|DB_UID|DB_GID|DB_SIZEG| - DB_LINKNAME|p); + DB_LINKNAME|X); + do_groupdef("X",X); do_groupdef("E",0); } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 ++ NEWS | 1 + doc/aide.conf.5.in | 14 +++++++----- src/aide.c | 54 +++++++++++++++------------------------------------ 4 files changed, 28 insertions(+), 44 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-10-08 17:38:20
|
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 86cabcb15c89b08266c91300a4e3c84aa95c6dc7 (commit) from ff52a1346860ac4762401813f6e5b0037b3cf250 (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 86cabcb15c89b08266c91300a4e3c84aa95c6dc7 Author: Hannes von Haugwitz <ha...@vo...> Date: Mon Oct 8 19:05:48 2012 +0200 src/gen_list.c: fixed handling of renamed files diff --git a/ChangeLog b/ChangeLog index 0188a77..e3c03a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-10-08 Hannes von Haugwitz <ha...@vo...> + * src/gen_list.c: fixed handling of renamed files + - read in databases in one go + - read in old database at the end + 2012-10-06 Hannes von Haugwitz <ha...@vo...> * Added new report_base16 option diff --git a/src/gen_list.c b/src/gen_list.c index 4090fcf..1b21221 100644 --- a/src/gen_list.c +++ b/src/gen_list.c @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2006,2009-2011 Rami Lehti,Pablo Virolainen, Mike + * Copyright (C) 1999-2006,2009-2012 Rami Lehti,Pablo Virolainen, Mike * Markley, Richard van den Berg, Hannes von Haugwitz * $Header$ * @@ -1052,7 +1052,6 @@ db_line* get_file_attrs(char* filename,DB_ATTR_TYPE attr) void populate_tree(seltree* tree) { /* FIXME this function could really use threads */ - int i=0; int add=0; db_line* old=NULL; db_line* new=NULL; @@ -1074,39 +1073,9 @@ void populate_tree(seltree* tree) ignorelist=0; } - do{ - /* We add 100 files every turn from both inputs - if the other input is disk it is added one dir at a time until - 100 files have been added - */ - if((conf->action&DO_COMPARE)||(conf->action&DO_DIFF)){ - i=0; - for(old=db_readline(DB_OLD);i<100&&old;){ - /* This is needed because check_rxtree assumes there is a parent - for the node for old->filename */ - if((node=get_seltree_node(tree,old->filename))==NULL){ - node=new_seltree_node(tree,old->filename,0,NULL); - } - if((add=check_rxtree(old->filename,tree,&attr))>0){ - add_file_to_tree(tree,old,DB_OLD,0,attr); - i++; - }else{ - free_db_line(old); - free(old); - old=NULL; - if(!initdbwarningprinted){ - error(3,_("WARNING: Old db contains a entry that shouldn\'t be there, run --init or --update\n")); - initdbwarningprinted=1; - } - } - if(i<100){ - old=db_readline(DB_OLD); - } - } - } if(conf->action&DO_DIFF){ - i=0; - for(new=db_readline(DB_NEW);i<100&&new;){ + do { + if((new=db_readline(DB_NEW)) != NULL){ /* FIXME add support config checking at this stage config check = add only those files that match config rxs make this configurable @@ -1119,38 +1088,52 @@ void populate_tree(seltree* tree) } if((add=check_rxtree(new->filename,tree,&attr))>0){ add_file_to_tree(tree,new,DB_NEW,0,attr); - i++; } else { free_db_line(new); free(new); new=NULL; } - if(i<100){ - new=db_readline(DB_NEW); - } } + } while (new); } if((conf->action&DO_INIT)||(conf->action&DO_COMPARE)){ /* FIXME */ new=NULL; - i=0; - for(new=db_readline(DB_DISK);i<100&&new;){ + do { + if((new=db_readline(DB_DISK)) != NULL) { /* Write to db only if needed */ if(conf->action&DO_INIT){ db_writeline(new,conf); } if((add=check_rxtree(new->filename,tree,&attr))>0){ add_file_to_tree(tree,new,DB_NEW,0,attr); - i++; } - if(i<100){ - new=db_readline(DB_DISK); - } } - + } while (new); + } + if((conf->action&DO_COMPARE)||(conf->action&DO_DIFF)){ + do{ + if((old=db_readline(DB_OLD)) != NULL) { + /* This is needed because check_rxtree assumes there is a parent + for the node for old->filename */ + if((node=get_seltree_node(tree,old->filename))==NULL){ + node=new_seltree_node(tree,old->filename,0,NULL); + } + if((add=check_rxtree(old->filename,tree,&attr))>0){ + add_file_to_tree(tree,old,DB_OLD,0,attr); + }else{ + free_db_line(old); + free(old); + old=NULL; + if(!initdbwarningprinted){ + error(3,_("WARNING: Old db contains a entry that shouldn\'t be there, run --init or --update\n")); + initdbwarningprinted=1; + } + } + } + }while(old); } - }while(old || new); } void hsymlnk(db_line* line) { ----------------------------------------------------------------------- Summary of changes: ChangeLog | 5 +++ src/gen_list.c | 75 +++++++++++++++++++++---------------------------------- 2 files changed, 34 insertions(+), 46 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-10-06 13:17:58
|
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 ff52a1346860ac4762401813f6e5b0037b3cf250 (commit) from d75558b59ca56127a01b14696965a62cf835ed85 (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 ff52a1346860ac4762401813f6e5b0037b3cf250 Author: Hannes von Haugwitz <ha...@vo...> Date: Sat Oct 6 14:59:19 2012 +0200 Added new report_base16 option diff --git a/ChangeLog b/ChangeLog index 6a665ce..0188a77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-10-06 Hannes von Haugwitz <ha...@vo...> + * Added new report_base16 option + 2012-09-05 Hannes von Haugwitz <ha...@vo...> * src/compare_db.c: support older versions of e2fsprogs diff --git a/NEWS b/NEWS index caf2fea..51468a7 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ Version 0.16 (NOT_YET_RELEASED) * Compare database entries just once * Added new root_prefix option * Added new detailed_init_report option + * Added new report_base16 option * Wrap attribute values instead of cut them off * Side-by-side output of acl and xattrs values * Use '|' to separate the old value from the new one diff --git a/doc/aide.1.in b/doc/aide.1.in index 9620673..99e8bf1 100644 --- a/doc/aide.1.in +++ b/doc/aide.1.in @@ -73,7 +73,8 @@ conditions: Please note that due to mmap issues, aide cannot be terminated with SIGTERM. Use SIGKILL to terminate. -The checksums in the database and in the output are base64 encoded. +The checksums in the database and in the output are by default base64 +encoded (see also report_base16 option). To decode them you can use the following shell command: echo <encoded_checksum> | base64 -d | hexdump -v -e '32/1 "%02x" "\\n"' diff --git a/doc/aide.conf.5.in b/doc/aide.conf.5.in index 2e5886b..3100622 100644 --- a/doc/aide.conf.5.in +++ b/doc/aide.conf.5.in @@ -48,6 +48,10 @@ output is written when doing \-\-check, \-\-update or \-\-compare. The url that the output is written to. There can be multiple instances of this parameter. Output is written to all of them. The default is stdout. +.IP "report_base16" +Whether to base16 encode the checksums in the report or not. Valid values are +yes, true, no and false. The default is to report checksums not in base16 but +in base64 encoding. .IP "detailed_init_report" Whether to report added files (verbose level >= 2) and their details (verbose level >=6) in initialization mode or not. Valid values are yes, true, no and diff --git a/include/db_config.h b/include/db_config.h index edda80e..e0a46ce 100644 --- a/include/db_config.h +++ b/include/db_config.h @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2002,2004-2006,2010,2011 Rami Lehti, Pablo Virolainen, + * Copyright (C) 1999-2002,2004-2006,2010-2012 Rami Lehti, Pablo Virolainen, * Richard van den Berg, Hannes von Haugwitz * $Header$ * @@ -310,6 +310,7 @@ typedef struct db_config { int verbose_level; int detailed_init_report; + int report_base16; int use_initial_errorsto; url_t* initial_report_url; diff --git a/src/aide.c b/src/aide.c index e6f95a9..8bd25f5 100644 --- a/src/aide.c +++ b/src/aide.c @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, Mike + * Copyright (C) 1999-2006,2010-2012 Rami Lehti, Pablo Virolainen, Mike * Markley, Richard van den Berg, Hannes von Haugwitz * $Header$ * @@ -270,6 +270,7 @@ static void setdefaults_before_config() conf->config_check=0; conf->verbose_level=-1; conf->detailed_init_report=0; + conf->report_base16=0; conf->use_initial_errorsto=1; conf->report_url=NULL; conf->report_fd=NULL; diff --git a/src/compare_db.c b/src/compare_db.c index 3ea3ee5..8c15dc0 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -306,6 +306,15 @@ static char* get_file_type_string(mode_t mode) { } } +static char* byte_to_base16(byte* src, size_t ssize) { + char* str = malloc((2*ssize+1) * sizeof (char)); + int i; + for(i=0; i<ssize; ++i) { + snprintf(&str[2*i], 3, "%02x", src[i]); + } + return str; +} + static int get_attribute_values(DB_ATTR_TYPE attr, db_line* line, char* **values) { @@ -316,7 +325,11 @@ snprintf(*values[0], l, "%s",s); #define easy_md(a,b,c) \ } else if (a&attr) { \ - *values[0] = encode_base64(line->b, c); + if (conf->report_base16) { \ + *values[0] = byte_to_base16(line->b, c); \ + } else { \ + *values[0] = encode_base64(line->b, c); \ + } #define easy_number(a,b,c) \ } else if (a&attr) { \ diff --git a/src/conf_lex.l b/src/conf_lex.l index 4aa4ab5..71378a5 100644 --- a/src/conf_lex.l +++ b/src/conf_lex.l @@ -15,7 +15,7 @@ EX [" "\t]* #define YYDEBUG /* - * Copyright (C) 1999-2002,2004-2006,2010,2011 Rami Lehti, Pablo + * Copyright (C) 1999-2002,2004-2006,2010-2012 Rami Lehti, Pablo * Virolainen, Richard van den Berg, Hannes von Haugwitz * $Header$ * This program is free software; you can redistribute it and/or @@ -349,6 +349,12 @@ int var_in_conflval=0; return (TDETAILEDINITREPORT); } +^[\t\ ]*"report_base16"{E} { + error(230,"%li:report_base16 =\n",conf_lineno); + BEGIN CONFVALHUNT; + return (TREPORTBASE16); +} + ^[\t\ ]*"gzip_dbout"{E} { error(230,"%li:gzip_dbout =\n",conf_lineno); BEGIN CONFVALHUNT; diff --git a/src/conf_yacc.y b/src/conf_yacc.y index 0e01e97..136c666 100644 --- a/src/conf_yacc.y +++ b/src/conf_yacc.y @@ -1,7 +1,7 @@ %{ /* - * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, + * Copyright (C) 1999-2006,2010-2012 Rami Lehti, Pablo Virolainen, * Richard van den Berg, Hannes von Haugwitz * $Header$ * This program is free software; you can redistribute it and/or @@ -76,6 +76,7 @@ extern long conf_lineno; %token TNEWLINE %token TVERBOSE %token TDETAILEDINITREPORT +%token TREPORTBASE16 %token TCONFIG_FILE %token TDATABASE %token TDATABASE_OUT @@ -152,7 +153,7 @@ lines : lines line | ; line : rule | equrule | negrule | definestmt | undefstmt | ifdefstmt | ifndefstmt | ifhoststmt | ifnhoststmt | groupdef | db_in | db_out | db_new | verbose | detailed_init_report | config_version - | report | gzipdbout | root_prefix | recursion_stopper | warn_dead_symlinks | grouped + | report | gzipdbout | root_prefix | report_base16 | recursion_stopper | warn_dead_symlinks | grouped | summarize_changes | acl_no_symlink_follow | beginconfigstmt | endconfigstmt | TEOF { newlinelastinconfig=1; @@ -310,6 +311,14 @@ detailed_init_report : TDETAILEDINITREPORT TFALSE { conf->detailed_init_report=0; } ; +report_base16 : TREPORTBASE16 TTRUE { + conf->report_base16=1; +} ; + +report_base16 : TREPORTBASE16 TFALSE { + conf->report_base16=0; +} ; + grouped : TGROUPED TTRUE { conf->grouped=1; } ; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ NEWS | 1 + doc/aide.1.in | 3 ++- doc/aide.conf.5.in | 4 ++++ include/db_config.h | 3 ++- src/aide.c | 3 ++- src/compare_db.c | 15 ++++++++++++++- src/conf_lex.l | 8 +++++++- src/conf_yacc.y | 13 +++++++++++-- 9 files changed, 46 insertions(+), 7 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-09-05 05:02:27
|
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 d75558b59ca56127a01b14696965a62cf835ed85 (commit) from 38bd7b087b98976e898b10a6555d6bc563e9da2d (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 d75558b59ca56127a01b14696965a62cf835ed85 Author: Hannes von Haugwitz <ha...@vo...> Date: Wed Sep 5 06:45:53 2012 +0200 s/compare_db.c: support older versions of e2fsprogs diff --git a/ChangeLog b/ChangeLog index 4ab76ce..6a665ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-09-05 Hannes von Haugwitz <ha...@vo...> + * src/compare_db.c: support older versions of e2fsprogs + 2012-06-19 Hannes von Haugwitz <ha...@vo...> * src/db_file.c: added missing format string to dofprintf calls diff --git a/src/compare_db.c b/src/compare_db.c index 927a7df..3ea3ee5 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -134,8 +134,22 @@ const char* details_string[] = { _("File type") , _("Lname"), _("Size"), _("Size unsigned long flag_bits[] = { EXT2_SECRM_FL, EXT2_UNRM_FL, EXT2_SYNC_FL, EXT2_DIRSYNC_FL, EXT2_IMMUTABLE_FL, EXT2_APPEND_FL, EXT2_NODUMP_FL, EXT2_NOATIME_FL, EXT2_COMPR_FL, EXT2_COMPRBLK_FL, EXT2_DIRTY_FL, EXT2_NOCOMPR_FL, EXT2_ECOMPR_FL, EXT3_JOURNAL_DATA_FL, EXT2_INDEX_FL, - EXT2_NOTAIL_FL, EXT2_TOPDIR_FL, EXT4_EXTENTS_FL, EXT4_HUGE_FILE_FL}; - char flag_char[] = "suSDiadAcBZXEjItTeh"; + EXT2_NOTAIL_FL, EXT2_TOPDIR_FL +#ifdef EXT4_EXTENTS_FL + , EXT4_EXTENTS_FL +#endif +#ifdef EXT4_HUGE_FILE_FL + , EXT4_HUGE_FILE_FL +#endif + }; + char flag_char[] = { 's', 'u', 'S', 'D', 'i', 'a', 'd', 'A', 'c', 'B', 'Z', 'X', 'E', 'j', 'I', 't', 'T' +#ifdef EXT4_EXTENTS_FL + , 'e' +#endif +#ifdef EXT4_HUGE_FILE_FL + , 'h' +#endif + }; #endif /*************/ @@ -257,16 +271,17 @@ static int acl2array(acl_type* acl, char* **values) { #ifdef WITH_E2FSATTRS static char* e2fsattrs2string(unsigned long flags) { - char* string = malloc (20 * sizeof (char)); + int length = sizeof(flag_bits)/sizeof(long); + char* string = malloc ((length+1) * sizeof (char)); int i; - for (i = 0 ; i < 19 ; i++) { + for (i = 0 ; i < length ; i++) { if (flag_bits[i] & flags) { string[i]=flag_char[i]; } else { string[i]='-'; } } - string[19] = '\0'; + string[length] = '\0'; return string; } #endif ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ src/compare_db.c | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-07-04 15:59:35
|
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 38bd7b087b98976e898b10a6555d6bc563e9da2d (commit) from cb1c71e358a5727edaaa1c22f487f0ad45714262 (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 38bd7b087b98976e898b10a6555d6bc563e9da2d Author: Hannes von Haugwitz <ha...@vo...> Date: Wed Jul 4 17:46:39 2012 +0200 Removed auto-generated INSTALL file from repository diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 7d1c323..0000000 --- a/INSTALL +++ /dev/null @@ -1,365 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - ----------------------------------------------------------------------- Summary of changes: INSTALL | 365 --------------------------------------------------------------- 1 files changed, 0 insertions(+), 365 deletions(-) delete mode 100644 INSTALL hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2012-06-19 06:10:20
|
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 cb1c71e358a5727edaaa1c22f487f0ad45714262 (commit) from 633fb7cc99d0b96de68d6182777dd89f65e519e0 (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 cb1c71e358a5727edaaa1c22f487f0ad45714262 Author: Hannes von Haugwitz <ha...@vo...> Date: Tue Jun 19 07:42:01 2012 +0200 src/db_file.c: added missing format string diff --git a/ChangeLog b/ChangeLog index 9f11dda..4ab76ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2012-06-19 Hannes von Haugwitz <ha...@vo...> + * src/db_file.c: added missing format string to dofprintf calls + 2011-10-02 Hannes von Haugwitz <ha...@vo...> * Added new detailed_init_report option diff --git a/src/db_file.c b/src/db_file.c index 13ebd44..984d041 100644 --- a/src/db_file.c +++ b/src/db_file.c @@ -669,7 +669,7 @@ int db_write_byte_base64(byte*data,size_t len,FILE* file,int i, } if(tmpstr){ - retval=dofprintf(tmpstr); + retval=dofprintf("%s", tmpstr); free(tmpstr); return retval; }else { @@ -708,7 +708,7 @@ int db_write_time_base64(time_t i,FILE* file,int a) tmpstr=encode_base64((byte *)ptr,strlen(ptr)); - retval=dofprintf(tmpstr); + retval=dofprintf("%s", tmpstr); free(tmpstr); free(ptr); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ src/db_file.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-10-02 17:29:22
|
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 633fb7cc99d0b96de68d6182777dd89f65e519e0 (commit) from f54452c274f8afa5f915c9fbdf1648670a2fe0a4 (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 633fb7cc99d0b96de68d6182777dd89f65e519e0 Author: Hannes von Haugwitz <ha...@vo...> Date: Sun Oct 2 18:55:55 2011 +0200 Added new detailed_init_report option diff --git a/ChangeLog b/ChangeLog index eac0707..9f11dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2011-10-02 Hannes von Haugwitz <ha...@vo...> + * Added new detailed_init_report option + 2011-09-29 Hannes von Haugwitz <ha...@vo...> * configure.in, include/aide.h, src/db_file.c: - fixed 'undef' compiler warnings diff --git a/NEWS b/NEWS index 40c8983..caf2fea 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ Version 0.16 (NOT_YET_RELEASED) * Enabled summarize_changes by default * Compare database entries just once * Added new root_prefix option + * Added new detailed_init_report option * Wrap attribute values instead of cut them off * Side-by-side output of acl and xattrs values * Use '|' to separate the old value from the new one @@ -11,8 +12,6 @@ Version 0.16 (NOT_YET_RELEASED) or higher * Print added and removed attribute values of changed entries in verbose level 6 or higher - * Print list of added files (verbose level >= 2) and their details (verbose - level >= 6) if database has been initialized * Added numeric timezone to time format * Print "End timestamp" message in report * Added run time to report diff --git a/doc/aide.conf.5.in b/doc/aide.conf.5.in index 29b497a..2e5886b 100644 --- a/doc/aide.conf.5.in +++ b/doc/aide.conf.5.in @@ -48,6 +48,10 @@ output is written when doing \-\-check, \-\-update or \-\-compare. The url that the output is written to. There can be multiple instances of this parameter. Output is written to all of them. The default is stdout. +.IP "detailed_init_report" +Whether to report added files (verbose level >= 2) and their details (verbose +level >=6) in initialization mode or not. Valid values are yes, true, no and +false. The default is to not report added files or their details in init mode. .IP "gzip_dbout" Whether the output to the database is gzipped or not. Valid values are yes,true,no and false. The default is no. This option is available only diff --git a/include/db_config.h b/include/db_config.h index d8323b3..edda80e 100644 --- a/include/db_config.h +++ b/include/db_config.h @@ -309,6 +309,7 @@ typedef struct db_config { list* negrxlst; int verbose_level; + int detailed_init_report; int use_initial_errorsto; url_t* initial_report_url; diff --git a/src/aide.c b/src/aide.c index 1b190cb..e6f95a9 100644 --- a/src/aide.c +++ b/src/aide.c @@ -269,6 +269,7 @@ static void setdefaults_before_config() conf->tree=NULL; conf->config_check=0; conf->verbose_level=-1; + conf->detailed_init_report=0; conf->use_initial_errorsto=1; conf->report_url=NULL; conf->report_fd=NULL; diff --git a/src/compare_db.c b/src/compare_db.c index 98a056e..927a7df 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -635,6 +635,7 @@ int gen_report(seltree* node) { send_audit_report(); #endif print_report_header(); + if(conf->action&(DO_COMPARE|DO_DIFF) || (conf->action&DO_INIT && conf->detailed_init_report) ) { if (conf->grouped) { if (nadd) { error(2,(char*)report_top_format,_("Added entries")); @@ -662,6 +663,7 @@ int gen_report(seltree* node) { error(nchg?5:6,(char*)report_top_format,_("Detailed information about changes")); print_report_details(node); } + } conf->end_time=time(&(conf->end_time)); print_report_footer(); diff --git a/src/conf_lex.l b/src/conf_lex.l index 9275d1a..4aa4ab5 100644 --- a/src/conf_lex.l +++ b/src/conf_lex.l @@ -343,6 +343,12 @@ int var_in_conflval=0; return (TREPORT_URL); } +^[\t\ ]*"detailed_init_report"{E} { + error(230,"%li:detailed_init_report =\n",conf_lineno); + BEGIN CONFVALHUNT; + return (TDETAILEDINITREPORT); +} + ^[\t\ ]*"gzip_dbout"{E} { error(230,"%li:gzip_dbout =\n",conf_lineno); BEGIN CONFVALHUNT; diff --git a/src/conf_yacc.y b/src/conf_yacc.y index 0ae586e..0e01e97 100644 --- a/src/conf_yacc.y +++ b/src/conf_yacc.y @@ -75,6 +75,7 @@ extern long conf_lineno; %token TSUMMARIZECHANGES %token TNEWLINE %token TVERBOSE +%token TDETAILEDINITREPORT %token TCONFIG_FILE %token TDATABASE %token TDATABASE_OUT @@ -150,7 +151,7 @@ lines : lines line | ; line : rule | equrule | negrule | definestmt | undefstmt | ifdefstmt | ifndefstmt | ifhoststmt | ifnhoststmt - | groupdef | db_in | db_out | db_new | verbose | config_version + | groupdef | db_in | db_out | db_new | verbose | detailed_init_report | config_version | report | gzipdbout | root_prefix | recursion_stopper | warn_dead_symlinks | grouped | summarize_changes | acl_no_symlink_follow | beginconfigstmt | endconfigstmt | TEOF { @@ -301,6 +302,14 @@ warn_dead_symlinks : TWARNDEADSYMLINKS TFALSE { conf->warn_dead_symlinks=0; } ; +detailed_init_report : TDETAILEDINITREPORT TTRUE { + conf->detailed_init_report=1; +} ; + +detailed_init_report : TDETAILEDINITREPORT TFALSE { + conf->detailed_init_report=0; +} ; + grouped : TGROUPED TTRUE { conf->grouped=1; } ; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ NEWS | 3 +-- doc/aide.conf.5.in | 4 ++++ include/db_config.h | 1 + src/aide.c | 1 + src/compare_db.c | 2 ++ src/conf_lex.l | 6 ++++++ src/conf_yacc.y | 11 ++++++++++- 8 files changed, 28 insertions(+), 3 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-29 19:14:05
|
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 f54452c274f8afa5f915c9fbdf1648670a2fe0a4 (commit) from 66f854ad860deda4981658a55235f5be097c5d1b (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 f54452c274f8afa5f915c9fbdf1648670a2fe0a4 Author: Hannes von Haugwitz <ha...@vo...> Date: Thu Sep 29 21:00:52 2011 +0200 Fixed 'undef' compiler warnings diff --git a/ChangeLog b/ChangeLog index 1e81673..eac0707 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-29 Hannes von Haugwitz <ha...@vo...> + * configure.in, include/aide.h, src/db_file.c: + - fixed 'undef' compiler warnings + 2011-09-24 Hannes von Haugwitz <ha...@vo...> * src/gen_list.c, include/do_md.h, src/do_md.c: - moved selinux2line function to src/do_md.c diff --git a/configure.in b/configure.in index 0b8c90c..b570760 100644 --- a/configure.in +++ b/configure.in @@ -557,6 +557,7 @@ AC_CHECK_FUNC(lstat64, AIDE_FSTAT_FUNC="fstat64" AIDE_STAT_TYPE="stat64" AIDE_OFF_TYPE="off64_t" + AC_DEFINE(HAVE_OFF64_T,1,[have off64_t]) AIDE_BLKCNT_TYPE="blkcnt64_t" [AC_CHECK_FUNC(readdir64, AIDE_READDIR_FUNC="readdir64" @@ -590,8 +591,6 @@ AC_CHECK_FUNC(lstat64, saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $AIDE_DEFS" -AC_CHECK_SIZEOF(off_t) -AC_CHECK_SIZEOF(off64_t) AC_CACHE_CHECK([for LFS ino_t],AIDE_INO_TYPE,[ AC_TRY_RUN([ #include <unistd.h> @@ -622,6 +621,8 @@ else AIDE_INO_TYPE=ino_t AIDE_DIRENT_TYPE=dirent fi +AC_CHECK_SIZEOF(off_t) +AC_CHECK_SIZEOF(off64_t) CFLAGS="$saved_CFLAGS" AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,$AIDE_LSTAT_FUNC,[lstat]) diff --git a/include/aide.h b/include/aide.h index 0af3788..8e07195 100644 --- a/include/aide.h +++ b/include/aide.h @@ -68,7 +68,7 @@ int snprintf(char *str,size_t count,const char *fmt,...); # define HAVE_STRTOIMAX #endif -#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG +#if defined HAVE_OFF64_TYPE && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || !defined HAVE_OFF64_TYPE && SIZEOF_OFF_T == SIZEOF_LONG_LONG # ifdef HAVE_STRTOLL # define AIDE_STRTOLL_FUNC strtoll # else diff --git a/src/db_file.c b/src/db_file.c index 0dc26f4..13ebd44 100644 --- a/src/db_file.c +++ b/src/db_file.c @@ -641,7 +641,7 @@ int db_writelong(AIDE_OFF_TYPE i,FILE* file,int a) dofprintf(" "); } -#if AIDE_OFF_TYPE == off64_t && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || AIDE_OFF_TYPE == off_t && SIZEOF_OFF_T == SIZEOF_LONG_LONG +#if defined HAVE_OFF64_TYPE && SIZEOF_OFF64_T == SIZEOF_LONG_LONG || !defined HAVE_OFF64_TYPE && SIZEOF_OFF_T == SIZEOF_LONG_LONG return dofprintf("%lli",(long long)i); #else return dofprintf("%li",i); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.in | 5 +++-- include/aide.h | 2 +- src/db_file.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-24 05:22:00
|
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 66f854ad860deda4981658a55235f5be097c5d1b (commit) from b2fbd32714a4b91aa84c9f4f238ba84ec51014a7 (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 66f854ad860deda4981658a55235f5be097c5d1b Author: Hannes von Haugwitz <ha...@vo...> Date: Sat Sep 24 07:17:31 2011 +0200 Declare db_writeacl only if WITH_ACL is defined diff --git a/ChangeLog b/ChangeLog index 276286c..1e81673 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * src/gen_list.c, include/do_md.h, src/do_md.c: - moved selinux2line function to src/do_md.c - moved xattrs2line function to src/do_md.c + * src/db_file.c: + - declare db_writeacl only if WITH_ACL is defined 2011-09-23 Hannes von Haugwitz <ha...@vo...> * include/db_disk.h, src/db_disk.c, src/db.c: diff --git a/src/db_file.c b/src/db_file.c index 6e0b3c4..0dc26f4 100644 --- a/src/db_file.c +++ b/src/db_file.c @@ -803,6 +803,7 @@ int db_writespec_file(db_config* dbconf) return RETOK; } +#ifdef WITH_ACL int db_writeacl(acl_type* acl,FILE* file,int a) { #ifdef WITH_SUN_ACL @@ -856,6 +857,7 @@ int db_writeacl(acl_type* acl,FILE* file,int a) return RETOK; } +#endif int db_writeline_file(db_line* line,db_config* dbconf, url_t* url){ int i; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ src/db_file.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-24 05:05:37
|
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 b2fbd32714a4b91aa84c9f4f238ba84ec51014a7 (commit) from bb186ddc7cf42f82fe77ccd81dabbcf5880e569c (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 b2fbd32714a4b91aa84c9f4f238ba84ec51014a7 Author: Hannes von Haugwitz <ha...@vo...> Date: Sat Sep 24 06:56:14 2011 +0200 Moved xattrs2line function to src/do_md.c diff --git a/ChangeLog b/ChangeLog index e4562ab..276286c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2011-09-24 Hannes von Haugwitz <ha...@vo...> * src/gen_list.c, include/do_md.h, src/do_md.c: - moved selinux2line function to src/do_md.c + - moved xattrs2line function to src/do_md.c 2011-09-23 Hannes von Haugwitz <ha...@vo...> * include/db_disk.h, src/db_disk.c, src/db.c: diff --git a/include/do_md.h b/include/do_md.h index 44c5c33..9b4caf8 100644 --- a/include/do_md.h +++ b/include/do_md.h @@ -36,6 +36,10 @@ list* do_md(list* file_lst,db_config* conf); void acl2line(db_line* line); #endif +#ifdef WITH_XATTR +void xattrs2line(db_line *line); +#endif + #ifdef WITH_SELINUX void selinux2line(db_line *line); #endif diff --git a/src/do_md.c b/src/do_md.c index afa1db7..358199c 100644 --- a/src/do_md.c +++ b/src/do_md.c @@ -531,6 +531,103 @@ void acl2line(db_line* line) { } #endif +#ifdef WITH_XATTR +static xattrs_type *xattr_new(void) { + xattrs_type *ret = NULL; + + ret = malloc(sizeof(xattrs_type)); + ret->num = 0; + ret->sz = 2; + ret->ents = malloc(sizeof(xattr_node) * ret->sz); + + return (ret); +} + +static void *xzmemdup(const void *ptr, size_t len) { + /* always keeps a 0 at the end... */ + void *ret = NULL; + + ret = malloc(len+1); + memcpy(ret, ptr, len); + ((char*)ret)[len] = 0; + + return (ret); +} + +static void xattr_add(xattrs_type *xattrs, const char *key, const char + *val, size_t vsz) { + if (xattrs->num >= xattrs->sz) { + xattrs->sz <<= 1; + xattrs->ents = realloc(xattrs->ents, sizeof(xattr_node) * xattrs->sz); + } + + xattrs->ents[xattrs->num].key = strdup(key); + xattrs->ents[xattrs->num].val = xzmemdup(val, vsz); + xattrs->ents[xattrs->num].vsz = vsz; + + xattrs->num += 1; +} + +void xattrs2line(db_line *line) { + /* get all generic user xattrs. */ + xattrs_type *xattrs = NULL; + static ssize_t xsz = 1024; + static char *xatrs = NULL; + ssize_t xret = -1; + + if (!(DB_XATTRS&line->attr)) + return; + + /* assume memory allocs work, like rest of AIDE code... */ + if (!xatrs) xatrs = malloc(xsz); + + while (((xret = llistxattr(line->fullpath, xatrs, xsz)) == -1) && (errno == ERANGE)) { + xsz <<= 1; + xatrs = realloc(xatrs, xsz); + } + + if ((xret == -1) && ((errno == ENOSYS) || (errno == ENOTSUP))) { + line->attr&=(~DB_XATTRS); + } else if (xret == -1) { + error(0, "listxattrs failed for %s:%m\n", line->fullpath); + } else if (xret) { + const char *attr = xatrs; + static ssize_t asz = 1024; + static char *val = NULL; + + if (!val) val = malloc(asz); + + xattrs = xattr_new(); + + while (xret > 0) { + size_t len = strlen(attr); + ssize_t aret = 0; + + if (strncmp(attr, "user.", strlen("user.")) && + strncmp(attr, "root.", strlen("root."))) + goto next_attr; /* only store normal xattrs, and SELinux */ + + while (((aret = getxattr(line->fullpath, attr, val, asz)) == + -1) && (errno == ERANGE)) { + asz <<= 1; + val = realloc (val, asz); + } + + if (aret != -1) + xattr_add(xattrs, attr, val, aret); + else if (errno != ENOATTR) + error(0, "getxattr failed for %s:%m\n", line->fullpath); + +next_attr: + attr += len + 1; + xret -= len + 1; + } + } + + line->xattrs = xattrs; +} +#endif + #ifdef WITH_SELINUX void selinux2line(db_line *line) { char *cntx = NULL; diff --git a/src/gen_list.c b/src/gen_list.c index 29e17bd..4090fcf 100644 --- a/src/gen_list.c +++ b/src/gen_list.c @@ -552,112 +552,6 @@ void gen_seltree(list* rxlist,seltree* tree,char type) } } -static xattrs_type *xattr_new(void) -{ - xattrs_type *ret = NULL; - - ret = malloc(sizeof(xattrs_type)); - ret->num = 0; - ret->sz = 2; - ret->ents = malloc(sizeof(xattr_node) * ret->sz); - - return (ret); -} - -static void *xzmemdup(const void *ptr, size_t len) -{ /* always keeps a 0 at the end... */ - void *ret = NULL; - - ret = malloc(len+1); - memcpy(ret, ptr, len); - ((char*)ret)[len] = 0; - - return (ret); -} - -static void xattr_add(xattrs_type *xattrs, - const char *key, const char *val, size_t vsz) -{ - if (xattrs->num >= xattrs->sz) - { - xattrs->sz <<= 1; - xattrs->ents = realloc(xattrs->ents, sizeof(xattr_node) * xattrs->sz); - } - - xattrs->ents[xattrs->num].key = strdup(key); - xattrs->ents[xattrs->num].val = xzmemdup(val, vsz); - xattrs->ents[xattrs->num].vsz = vsz; - - xattrs->num += 1; -} - -/* should be in do_md ? */ -static void xattrs2line(db_line *line) -{ /* get all generic user xattrs. */ -#ifdef WITH_XATTR - xattrs_type *xattrs = NULL; - static ssize_t xsz = 1024; - static char *xatrs = NULL; - ssize_t xret = -1; - - if (!(DB_XATTRS&line->attr)) - return; - - /* assume memory allocs work, like rest of AIDE code... */ - if (!xatrs) xatrs = malloc(xsz); - - while (((xret = llistxattr(line->fullpath, xatrs, xsz)) == -1) && - (errno == ERANGE)) - { - xsz <<= 1; - xatrs = realloc(xatrs, xsz); - } - - if ((xret == -1) && ((errno == ENOSYS) || (errno == ENOTSUP))) - { line->attr&=(~DB_XATTRS); } - else if (xret == -1) - error(0, "listxattrs failed for %s:%m\n", line->fullpath); - else if (xret) - { - const char *attr = xatrs; - static ssize_t asz = 1024; - static char *val = NULL; - - if (!val) val = malloc(asz); - - xattrs = xattr_new(); - - while (xret > 0) - { - size_t len = strlen(attr); - ssize_t aret = 0; - - if (strncmp(attr, "user.", strlen("user.")) && - strncmp(attr, "root.", strlen("root."))) - goto next_attr; /* only store normal xattrs, and SELinux */ - - while (((aret = getxattr(line->fullpath, attr, val, asz)) == -1) && - (errno == ERANGE)) - { - asz <<= 1; - val = realloc (val, asz); - } - - if (aret != -1) - xattr_add(xattrs, attr, val, aret); - else if (errno != ENOATTR) - error(0, "getxattr failed for %s:%m\n", line->fullpath); - - next_attr: - attr += len + 1; - xret -= len + 1; - } - } - - line->xattrs = xattrs; -#endif -} - int check_list_for_match(list* rxrlist,char* text,DB_ATTR_TYPE* attr) { list* r=NULL; @@ -1130,7 +1024,9 @@ db_line* get_file_attrs(char* filename,DB_ATTR_TYPE attr) acl2line(line); #endif +#ifdef WITH_XATTR xattrs2line(line); +#endif #ifdef WITH_SELINUX selinux2line(line); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + include/do_md.h | 4 ++ src/do_md.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++ src/gen_list.c | 108 +----------------------------------------------------- 4 files changed, 104 insertions(+), 106 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-24 04:43:52
|
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 bb186ddc7cf42f82fe77ccd81dabbcf5880e569c (commit) from a56d4cb0d4cf07c9987a57fd77a66518e107d58f (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 bb186ddc7cf42f82fe77ccd81dabbcf5880e569c Author: Hannes von Haugwitz <ha...@vo...> Date: Sat Sep 24 06:21:02 2011 +0200 Moved selinux2line function to src/do_md.c diff --git a/ChangeLog b/ChangeLog index 783f364..e4562ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-24 Hannes von Haugwitz <ha...@vo...> + * src/gen_list.c, include/do_md.h, src/do_md.c: + - moved selinux2line function to src/do_md.c + 2011-09-23 Hannes von Haugwitz <ha...@vo...> * include/db_disk.h, src/db_disk.c, src/db.c: - fixed 'unused-parameter' compiler warning diff --git a/include/do_md.h b/include/do_md.h index 9ee162c..44c5c33 100644 --- a/include/do_md.h +++ b/include/do_md.h @@ -36,6 +36,10 @@ list* do_md(list* file_lst,db_config* conf); void acl2line(db_line* line); #endif +#ifdef WITH_SELINUX +void selinux2line(db_line *line); +#endif + #ifdef WITH_E2FSATTRS void e2fsattrs2line(db_line* line); #endif diff --git a/src/do_md.c b/src/do_md.c index 68d9a4d..afa1db7 100644 --- a/src/do_md.c +++ b/src/do_md.c @@ -531,6 +531,26 @@ void acl2line(db_line* line) { } #endif +#ifdef WITH_SELINUX +void selinux2line(db_line *line) { + char *cntx = NULL; + + if (!(DB_SELINUX&line->attr)) + return; + + if (lgetfilecon_raw(line->fullpath, &cntx) == -1) { + line->attr&=(~DB_SELINUX); + if ((errno != ENOATTR) && (errno != EOPNOTSUPP)) + error(0, "lgetfilecon_raw failed for %s:%m\n", line->fullpath); + return; + } + + line->cntx = strdup(cntx); + + freecon(cntx); +} +#endif + #ifdef WITH_E2FSATTRS void e2fsattrs2line(db_line* line) { unsigned long flags; diff --git a/src/gen_list.c b/src/gen_list.c index 086f2fa..29e17bd 100644 --- a/src/gen_list.c +++ b/src/gen_list.c @@ -658,29 +658,6 @@ static void xattrs2line(db_line *line) #endif } -/* should be in do_md ? */ -static void selinux2line(db_line *line) -{ -#ifdef WITH_SELINUX - char *cntx = NULL; - - if (!(DB_SELINUX&line->attr)) - return; - - if (lgetfilecon_raw(line->fullpath, &cntx) == -1) - { - line->attr&=(~DB_SELINUX); - if ((errno != ENOATTR) && (errno != EOPNOTSUPP)) - error(0, "lgetfilecon_raw failed for %s:%m\n", line->fullpath); - return; - } - - line->cntx = strdup(cntx); - - freecon(cntx); -#endif -} - int check_list_for_match(list* rxrlist,char* text,DB_ATTR_TYPE* attr) { list* r=NULL; @@ -1155,7 +1132,9 @@ db_line* get_file_attrs(char* filename,DB_ATTR_TYPE attr) xattrs2line(line); +#ifdef WITH_SELINUX selinux2line(line); +#endif #ifdef WITH_E2FSATTRS e2fsattrs2line(line); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ include/do_md.h | 4 ++++ src/do_md.c | 20 ++++++++++++++++++++ src/gen_list.c | 25 ++----------------------- 4 files changed, 30 insertions(+), 23 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-23 20:37:49
|
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 a56d4cb0d4cf07c9987a57fd77a66518e107d58f (commit) from bd1920efa605d1c38bf8d484361f3ad2b252fc7a (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 a56d4cb0d4cf07c9987a57fd77a66518e107d58f Author: Hannes von Haugwitz <ha...@vo...> Date: Fri Sep 23 20:07:33 2011 +0200 Call acl2line only if WITH_ACL is defined diff --git a/ChangeLog b/ChangeLog index b17053e..783f364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ db_writeline_disk, db_close_disk) * src/db_file.c: - fixed 'unused-but-set-variable' compiler warnings + * src/gen_list.c, include/do_md.h, src/do_md.c: + - call acl2line only if WITH_ACL is defined 2011-09-22 Hannes von Haugwitz <ha...@vo...> * src/be.c: diff --git a/include/do_md.h b/include/do_md.h index d7eb96a..9ee162c 100644 --- a/include/do_md.h +++ b/include/do_md.h @@ -1,6 +1,6 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2002,2006,2010 Rami Lehti, Pablo Virolainen, + * Copyright (C) 1999-2002,2006,2010,2011 Rami Lehti, Pablo Virolainen, * Richard van den Berg, Hannes von Haugwitz * * $Header$ @@ -32,7 +32,9 @@ list* do_md(list* file_lst,db_config* conf); +#ifdef WITH_ACL void acl2line(db_line* line); +#endif #ifdef WITH_E2FSATTRS void e2fsattrs2line(db_line* line); diff --git a/src/do_md.c b/src/do_md.c index 27f58eb..68d9a4d 100644 --- a/src/do_md.c +++ b/src/do_md.c @@ -446,6 +446,7 @@ void fs2db_line(struct AIDE_STAT_TYPE* fs,db_line* line) { } +#ifdef WITH_ACL void acl2line(db_line* line) { acl_type *ret = NULL; @@ -528,6 +529,7 @@ void acl2line(db_line* line) { } #endif } +#endif #ifdef WITH_E2FSATTRS void e2fsattrs2line(db_line* line) { diff --git a/src/gen_list.c b/src/gen_list.c index 655b66c..086f2fa 100644 --- a/src/gen_list.c +++ b/src/gen_list.c @@ -1148,7 +1148,10 @@ db_line* get_file_attrs(char* filename,DB_ATTR_TYPE attr) /* ACL stuff */ + +#ifdef WITH_ACL acl2line(line); +#endif xattrs2line(line); ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ include/do_md.h | 4 +++- src/do_md.c | 2 ++ src/gen_list.c | 3 +++ 4 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-23 10:06:59
|
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 bd1920efa605d1c38bf8d484361f3ad2b252fc7a (commit) from 33d7c1c56cadd1ef7cecfea892c921ddf11e6cef (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 bd1920efa605d1c38bf8d484361f3ad2b252fc7a Author: Hannes von Haugwitz <ha...@vo...> Date: Fri Sep 23 11:59:15 2011 +0200 src/db_file.c: fixed compiler warnings diff --git a/ChangeLog b/ChangeLog index 08017b0..b17053e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ * include/db_disk.h, src/db_disk.c: - removed unused functions (db_disk_read_spec, db_writespec_disk, db_writeline_disk, db_close_disk) + * src/db_file.c: + - fixed 'unused-but-set-variable' compiler warnings 2011-09-22 Hannes von Haugwitz <ha...@vo...> * src/be.c: diff --git a/src/db_file.c b/src/db_file.c index f2baff7..6e0b3c4 100644 --- a/src/db_file.c +++ b/src/db_file.c @@ -169,33 +169,18 @@ int db_file_read_spec(int db){ int i=0; int* db_osize=0; DB_FIELD** db_order=NULL; - FILE** db_filep=NULL; - url_t* db_url=NULL; -#ifdef WITH_ZLIB - gzFile* db_gzp=NULL; -#endif switch (db) { case DB_OLD: { db_osize=&(conf->db_in_size); db_order=&(conf->db_in_order); - db_filep=&(conf->db_in); - db_url=conf->db_in_url; db_lineno=&db_in_lineno; -#ifdef WITH_ZLIB - db_gzp=&(conf->db_gzin); -#endif break; } case DB_NEW: { db_osize=&(conf->db_new_size); db_order=&(conf->db_new_order); - db_filep=&(conf->db_new); - db_url=conf->db_new_url; db_lineno=&db_new_lineno; -#ifdef WITH_ZLIB - db_gzp=&(conf->db_gznew); -#endif break; } } @@ -308,9 +293,6 @@ char** db_readline_file(int db){ DB_FIELD** db_order=NULL; FILE** db_filep=NULL; url_t* db_url=NULL; -#ifdef WITH_ZLIB - gzFile* db_gzp=NULL; -#endif switch (db) { case DB_OLD: { @@ -325,10 +307,6 @@ char** db_readline_file(int db){ db_filep=&(conf->db_in); db_url=conf->db_in_url; db_lineno=&db_in_lineno; - -#ifdef WITH_ZLIB - db_gzp=&(conf->db_gzin); -#endif break; } case DB_NEW: { @@ -343,9 +321,6 @@ char** db_readline_file(int db){ db_filep=&(conf->db_new); db_url=conf->db_new_url; db_lineno=&db_new_lineno; -#ifdef WITH_ZLIB - db_gzp=&(conf->db_gznew); -#endif break; } } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ src/db_file.c | 25 ------------------------- 2 files changed, 2 insertions(+), 25 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-23 09:38:38
|
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 33d7c1c56cadd1ef7cecfea892c921ddf11e6cef (commit) from fe38a56bce6a60c88d520aed30b43bcd5ee9357d (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 33d7c1c56cadd1ef7cecfea892c921ddf11e6cef Author: Hannes von Haugwitz <ha...@vo...> Date: Fri Sep 23 11:30:02 2011 +0200 i/db_disk.h,s/db_disk.c: removed unused functions diff --git a/ChangeLog b/ChangeLog index 5970dd2..08017b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2011-09-23 Hannes von Haugwitz <ha...@vo...> * include/db_disk.h, src/db_disk.c, src/db.c: - fixed 'unused-parameter' compiler warning + * include/db_disk.h, src/db_disk.c: + - removed unused functions (db_disk_read_spec, db_writespec_disk, + db_writeline_disk, db_close_disk) 2011-09-22 Hannes von Haugwitz <ha...@vo...> * src/be.c: diff --git a/include/db_disk.h b/include/db_disk.h index c6f6f6e..e89facd 100644 --- a/include/db_disk.h +++ b/include/db_disk.h @@ -25,9 +25,6 @@ #include "db.h" db_line* db_readline_disk(); -int db_writespec_disk(db_config*); -int db_writeline_disk(db_line* line,db_config* conf); -int db_close_disk(db_config* conf); int db_disk_init(void); #endif diff --git a/src/db_disk.c b/src/db_disk.c index 729cedd..e1993f0 100644 --- a/src/db_disk.c +++ b/src/db_disk.c @@ -440,29 +440,11 @@ int db_disk_init () return RETOK; } -int db_disk_read_spec (int db) -{ - return RETOK; -} - /* - We don't support writing to disk, since we are'n a backup/restore software + We don't support writing to the pseudo-database disk, since we are'n a + backup/restore software. Hence the functions db_writespec_disk, + db_writeline_disk and db_close_disk aren't declared. */ -int db_writespec_disk (db_config * dbconf) -{ - return RETFAIL; -} - -int db_writeline_disk (db_line * line, db_config * dbconf) -{ - return RETFAIL; -} - -int db_close_disk (db_config * dbconf) -{ - return RETOK; -} - const char *aide_key_6 = CONFHMACKEY_06; const char *db_key_6 = DBHMACKEY_06; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ include/db_disk.h | 3 --- src/db_disk.c | 24 +++--------------------- 3 files changed, 6 insertions(+), 24 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-23 09:22:00
|
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 fe38a56bce6a60c88d520aed30b43bcd5ee9357d (commit) from 1e4041e7c648130d2c1745fbe0044be92d04ad02 (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 fe38a56bce6a60c88d520aed30b43bcd5ee9357d Author: Hannes von Haugwitz <ha...@vo...> Date: Fri Sep 23 11:13:40 2011 +0200 Fixed 'unused-parameter' compiler warning diff --git a/ChangeLog b/ChangeLog index 1a027eb..5970dd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-23 Hannes von Haugwitz <ha...@vo...> + * include/db_disk.h, src/db_disk.c, src/db.c: + - fixed 'unused-parameter' compiler warning + 2011-09-22 Hannes von Haugwitz <ha...@vo...> * src/be.c: - declared static functions static diff --git a/include/db_disk.h b/include/db_disk.h index 998c576..c6f6f6e 100644 --- a/include/db_disk.h +++ b/include/db_disk.h @@ -1,6 +1,7 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999,2000,2001,2002 Rami Lehti, Pablo Virolainen + * Copyright (C) 1999-2002,2011 Rami Lehti, Pablo Virolainen, Hannes von + * Haugwitz * $Header$ * * This program is free software; you can redistribute it and/or @@ -23,7 +24,7 @@ #include "db.h" -db_line* db_readline_disk(int); +db_line* db_readline_disk(); int db_writespec_disk(db_config*); int db_writeline_disk(db_line* line,db_config* conf); int db_close_disk(db_config* conf); diff --git a/src/db.c b/src/db.c index c688ec3..19b7859 100644 --- a/src/db.c +++ b/src/db.c @@ -206,7 +206,7 @@ db_line* db_readline(int db){ /* Nothing else to be done? */ - s=db_readline_disk(db); + s=db_readline_disk(); return s; } diff --git a/src/db_disk.c b/src/db_disk.c index f306726..729cedd 100644 --- a/src/db_disk.c +++ b/src/db_disk.c @@ -1,8 +1,8 @@ /* aide, Advanced Intrusion Detection Environment * vi: ts=2 sw=2 * - * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, Richard - * van den Berg, Mike Markley, Hannes von Haugwitz + * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, + * Richard van den Berg, Mike Markley, Hannes von Haugwitz * $Header$ * * This program is free software; you can redistribute it and/or @@ -176,7 +176,7 @@ void add_child (db_line * fil) Now implemented with goto-statement. Yeah, it's ugly and easy. */ -db_line *db_readline_disk (int db) +db_line *db_readline_disk () { db_line *fil = NULL; DB_ATTR_TYPE attr; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ include/db_disk.h | 5 +++-- src/db.c | 2 +- src/db_disk.c | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-22 19:05:30
|
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 1e4041e7c648130d2c1745fbe0044be92d04ad02 (commit) from 6ad3b66a6eee0645fbfa5613788b9f4fd22976d0 (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 1e4041e7c648130d2c1745fbe0044be92d04ad02 Author: Hannes von Haugwitz <ha...@vo...> Date: Thu Sep 22 21:01:13 2011 +0200 src/db.c: fixed compiler warnings diff --git a/ChangeLog b/ChangeLog index 2333fee..1a027eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ - fixed 'unused-but-set-variable' compiler warning * src/compare_db.c: - fixed some 'format' compiler warnings + * src/db.c: + - fixed 'unused-but-set-variable' compiler warnings 2011-09-21 Hannes von Haugwitz <ha...@vo...> * include/aide.h, src/aide.c: diff --git a/src/db.c b/src/db.c index d8e69b7..c688ec3 100644 --- a/src/db.c +++ b/src/db.c @@ -1,7 +1,7 @@ /* aide, Advanced Intrusion Detection Environment * - * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, Richard - * van den Berg, Hannes von Haugwitz + * Copyright (C) 1999-2006,2010,2011 Rami Lehti, Pablo Virolainen, + * Richard van den Berg, Hannes von Haugwitz * $Header$ * * This program is free software; you can redistribute it and/or @@ -323,22 +323,16 @@ db_line* db_char2line(char** ss,int db){ int i; db_line* line=(db_line*)malloc(sizeof(db_line)*1); - url_t* db_url=NULL; - FILE** db_filep=NULL; int* db_osize=0; DB_FIELD** db_order=NULL; switch (db) { case DB_OLD: { - db_url=conf->db_in_url; - db_filep=&(conf->db_in); db_osize=&(conf->db_in_size); db_order=&(conf->db_in_order); break; } case DB_NEW: { - db_url=conf->db_new_url; - db_filep=&(conf->db_new); db_osize=&(conf->db_new_size); db_order=&(conf->db_new_order); break; ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ src/db.c | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-22 18:56:26
|
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 6ad3b66a6eee0645fbfa5613788b9f4fd22976d0 (commit) from 2e2dabd788ba1c566aab1cf92ff8e0c517a913b2 (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 6ad3b66a6eee0645fbfa5613788b9f4fd22976d0 Author: Hannes von Haugwitz <ha...@vo...> Date: Thu Sep 22 20:50:45 2011 +0200 s/compare_db.c: fixed some compiler warnings diff --git a/ChangeLog b/ChangeLog index 1ade72f..2333fee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ - declared static functions static * src/commandconf.c: - fixed 'unused-but-set-variable' compiler warning + * src/compare_db.c: + - fixed some 'format' compiler warnings 2011-09-21 Hannes von Haugwitz <ha...@vo...> * include/aide.h, src/aide.c: diff --git a/src/compare_db.c b/src/compare_db.c index 2366e4d..98a056e 100644 --- a/src/compare_db.c +++ b/src/compare_db.c @@ -584,10 +584,10 @@ static void print_report_header() { if (!first) { error (2,"\n"); } if(conf->action&(DO_COMPARE|DO_DIFF) && (nadd||nrem||nchg)) { - error(0,_("\nSummary:\n Total number of entries:\t%i\n Added entries:\t\t%i\n" - " Removed entries:\t\t%i\n Changed entries:\t\t%i\n\n"), ntotal, nadd, nrem, nchg); + error(0,_("\nSummary:\n Total number of entries:\t%li\n Added entries:\t\t%li\n" + " Removed entries:\t\t%li\n Changed entries:\t\t%li\n\n"), ntotal, nadd, nrem, nchg); } else { - error(0,_("\nNumber of entries:\t%i\n"), ntotal); + error(0,_("\nNumber of entries:\t%li\n"), ntotal); } } ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ src/compare_db.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- aide |
From: Hannes v. H. <hvh...@us...> - 2011-09-22 07:49:36
|
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 2e2dabd788ba1c566aab1cf92ff8e0c517a913b2 (commit) from dc47f2855d549ab24c5c61aa0fdd9e771661d3b7 (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 2e2dabd788ba1c566aab1cf92ff8e0c517a913b2 Author: Hannes von Haugwitz <ha...@vo...> Date: Thu Sep 22 09:34:48 2011 +0200 src/commandconf.c: fixed compiler warning diff --git a/ChangeLog b/ChangeLog index 524d886..1ade72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2011-09-22 Hannes von Haugwitz <ha...@vo...> * src/be.c: - declared static functions static + * src/commandconf.c: + - fixed 'unused-but-set-variable' compiler warning 2011-09-21 Hannes von Haugwitz <ha...@vo...> * include/aide.h, src/aide.c: diff --git a/src/commandconf.c b/src/commandconf.c index b01fb77..74f6c38 100644 --- a/src/commandconf.c +++ b/src/commandconf.c @@ -243,7 +243,9 @@ int db_input_wrapper(char* buf, int max_size, int db) int c=0; int err=0; int* domd=NULL; +#ifdef WITH_CURL url_t* db_url=NULL; +#endif #ifdef WITH_MHASH char* tmp=NULL; MHASH* md=NULL; @@ -256,7 +258,9 @@ int db_input_wrapper(char* buf, int max_size, int db) #endif switch(db) { case DB_OLD: { +#ifdef WITH_CURL db_url=conf->db_in_url; +#endif domd=&(conf->do_dboldmd); #ifdef WITH_MHASH @@ -271,7 +275,9 @@ int db_input_wrapper(char* buf, int max_size, int db) break; } case DB_NEW: { +#ifdef WITH_CURL db_url=conf->db_new_url; +#endif domd=&(conf->do_dbnewmd); #ifdef WITH_MHASH ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ src/commandconf.c | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- aide |