75 lines
2.8 KiB
Diff
75 lines
2.8 KiB
Diff
From 6e2e2da6736476c8260871988d8e44a4c7797b3f Mon Sep 17 00:00:00 2001
|
|
From: Jakub Filak <jfilak@redhat.com>
|
|
Date: Tue, 18 Nov 2014 10:18:32 +0100
|
|
Subject: [PATCH] anaconda: mark anaconda-tb as editable file and remove rootpw
|
|
lines
|
|
|
|
anaconda-tb file contains the main information about Anaconda problems.
|
|
|
|
report-gtk won't be highlighting forbidden words, because anaconda-tb
|
|
contains many false positives words as the file is mainly composed of
|
|
log outputs.
|
|
|
|
Related to #1041558
|
|
|
|
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
---
|
|
src/gui-wizard-gtk/wizard.c | 2 +-
|
|
src/include/internal_libreport.h | 1 +
|
|
src/lib/problem_data.c | 1 +
|
|
src/plugins/bugzilla_anaconda_event.conf | 2 +-
|
|
4 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
|
|
index 8d0429e..ab6123f 100644
|
|
--- a/src/gui-wizard-gtk/wizard.c
|
|
+++ b/src/gui-wizard-gtk/wizard.c
|
|
@@ -1185,7 +1185,7 @@ static void append_item_to_ls_details(gpointer name, gpointer value, gpointer da
|
|
//FIXME: use the human-readable problem_item_format(item) instead of item->content.
|
|
if (item->flags & CD_FLAG_TXT)
|
|
{
|
|
- if (item->flags & CD_FLAG_ISEDITABLE)
|
|
+ if (item->flags & CD_FLAG_ISEDITABLE && strcmp(name, FILENAME_ANACONDA_TB) != 0)
|
|
{
|
|
GtkWidget *tab_lbl = gtk_label_new((char *)name);
|
|
GtkWidget *tev = gtk_text_view_new();
|
|
diff --git a/src/include/internal_libreport.h b/src/include/internal_libreport.h
|
|
index 2e75de0..d664fa4 100644
|
|
--- a/src/include/internal_libreport.h
|
|
+++ b/src/include/internal_libreport.h
|
|
@@ -913,6 +913,7 @@ struct dump_dir *open_directory_for_writing(
|
|
/* File names related to Anaconda problems
|
|
*/
|
|
#define FILENAME_KICKSTART_CFG "ks.cfg"
|
|
+#define FILENAME_ANACONDA_TB "anaconda-tb"
|
|
|
|
// Not stored as files, added "on the fly":
|
|
#define CD_DUMPDIR "Directory"
|
|
diff --git a/src/lib/problem_data.c b/src/lib/problem_data.c
|
|
index c095f6c..c57e57f 100644
|
|
--- a/src/lib/problem_data.c
|
|
+++ b/src/lib/problem_data.c
|
|
@@ -262,6 +262,7 @@ static const char *const editable_files[] = {
|
|
//FILENAME_REPORTED_TO,
|
|
//FILENAME_EVENT_LOG ,
|
|
FILENAME_KICKSTART_CFG,
|
|
+ FILENAME_ANACONDA_TB,
|
|
NULL
|
|
};
|
|
static bool is_editable_file(const char *file_name)
|
|
diff --git a/src/plugins/bugzilla_anaconda_event.conf b/src/plugins/bugzilla_anaconda_event.conf
|
|
index 923dda0..e45a10a 100644
|
|
--- a/src/plugins/bugzilla_anaconda_event.conf
|
|
+++ b/src/plugins/bugzilla_anaconda_event.conf
|
|
@@ -1,6 +1,6 @@
|
|
EVENT=report_Bugzilla component=anaconda
|
|
# remove sensitive information from the sensitive files
|
|
- for sf in backtrace ks.cfg; do
|
|
+ for sf in backtrace ks.cfg anaconda-tb; do
|
|
if [ -f $sf ]; then
|
|
# blindly remove entire line
|
|
# filing a less usable bug is surely better than publishing passwords
|
|
--
|
|
2.1.0
|
|
|