From 9669e34df23959fa18c2ce8920140e717440947f Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Thu, 23 Apr 2015 16:33:00 +0200 Subject: [PATCH] lib: allow creating root owned problem directories from problem data Without this patch libreport sets the owner of new problem directory according to FILENAME_UID. This approach is not sufficient because ABRT has introduced PrivateReports that should ensure that all problem directories are owned by root. So ABRT needs a way to tell libreport to create the new problem directory with uid=0. Signed-off-by: Jakub Filak --- src/include/problem_data.h | 1 + src/lib/create_dump_dir.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/include/problem_data.h b/src/include/problem_data.h index 9722562..5e271d3 100644 --- a/src/include/problem_data.h +++ b/src/include/problem_data.h @@ -140,6 +140,7 @@ problem_data_t *create_problem_data_for_reporting(const char *dump_dir_name); @param base_dir_name Location to store the problem data */ struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, const char *base_dir_name); +struct dump_dir *create_dump_dir_from_problem_data_ext(problem_data_t *problem_data, const char *base_dir_name, uid_t uid); /** @brief Saves the problem data object in opened dump directory diff --git a/src/lib/create_dump_dir.c b/src/lib/create_dump_dir.c index d2cdd29..dec75fa 100644 --- a/src/lib/create_dump_dir.c +++ b/src/lib/create_dump_dir.c @@ -85,7 +85,8 @@ struct dump_dir *create_dump_dir(const char *base_dir_name, const char *type, ui * reporting from anaconda where we can't read /etc/{system,redhat}-release * and os_release is taken from anaconda */ - dd_create_basic_files(dd, uid, NULL); + const uid_t crashed_uid = dd_exist(dd, FILENAME_UID) ? /*uid already saved*/-1 : uid; + dd_create_basic_files(dd, crashed_uid, NULL); problem_id[strlen(problem_id) - strlen(NEW_PD_SUFFIX)] = '\0'; char* new_path = concat_path_file(base_dir_name, problem_id); @@ -125,7 +126,7 @@ int save_problem_data_in_dump_dir(struct dump_dir *dd, problem_data_t *problem_d return 0; } -struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, const char *base_dir_name) +struct dump_dir *create_dump_dir_from_problem_data_ext(problem_data_t *problem_data, const char *base_dir_name, uid_t uid) { INITIALIZE_LIBREPORT(); @@ -143,6 +144,13 @@ struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, return NULL; } + return create_dump_dir(base_dir_name, type, uid, (save_data_call_back)save_problem_data_in_dump_dir, problem_data); +} + +struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, const char *base_dir_name) +{ + INITIALIZE_LIBREPORT(); + uid_t uid = (uid_t)-1L; char *uid_str = problem_data_get_content_or_NULL(problem_data, FILENAME_UID); @@ -161,5 +169,5 @@ struct dump_dir *create_dump_dir_from_problem_data(problem_data_t *problem_data, uid = (uid_t)val; } - return create_dump_dir(base_dir_name, type, uid, (save_data_call_back)save_problem_data_in_dump_dir, problem_data); + return create_dump_dir_from_problem_data_ext(problem_data, base_dir_name, uid); } -- 2.1.0