Merge branch 'master' into rhel6

Conflicts:
	src/Daemon/abrt.conf

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 8 insertions, 2 deletions

diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp
index 01c3850b..ba7e0a05 100644
--- a/src/Daemon/MiddleWare.cpp
+++ b/src/Daemon/MiddleWare.cpp
@@ -655,6 +655,12 @@ static mw_result_t SavePackageDescriptionToDebugDump(
                 log("Package '%s' isn't signed with proper key", packageName.c_str());
                 return MW_GPG_ERROR;
             }
+            /*
+              Checking the MD5 sum requires to run prelink to "un-prelink" the
+              binaries - this is considered potential security risk so we don't
+              use it, until we find some non-intrusive way
+            */
+            /*
             if (!CheckHash(packageName.c_str(), pExecutable))
             {
                 error_msg("Executable '%s' seems to be modified, "
@@ -662,6 +668,7 @@ static mw_result_t SavePackageDescriptionToDebugDump(
                                 pExecutable, packageName.c_str());
                 return MW_GPG_ERROR;
             }
+            */
         }
     }
 
diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf
index dec1c725..7829dc43 100644
--- a/src/Daemon/abrt.conf
+++ b/src/Daemon/abrt.conf
@@ -19,8 +19,7 @@ MaxCrashReportsSize = 1000
 #ActionsAndReporters = Mailx("[abrt] new crash was detected"), RunApp("cp /etc/mtab .")
 # If you don't want sosreport to be run immediately after crash,
 # you may comment it out here and add ", SOSreport" to "CCpp ="
-# and "Python =" lines below. That way it runs when crash is reported,
-# not when it occurs.
+# and "Python =" lines below.
 ActionsAndReporters = SOSreport
 
 # What actions or reporters to run on each crash type