[Aide-commits] aide branch, master, updated. v0.16a1-37-gbb186dd
Brought to you by:
hvhaugwitz,
rvdb
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 |