diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-14 16:52:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-12-14 16:52:38 +0100 |
commit | fdce1d751b45bbd0210b45989f4f4c0e092683dc (patch) | |
tree | 81d1dd901eece504a10d05e743eeb43d5eaec04c /src/Daemon/MiddleWare.cpp | |
parent | a238ed9f6c80054028c6ba48a5fe773f8150c7c6 (diff) | |
download | abrt-fdce1d751b45bbd0210b45989f4f4c0e092683dc.tar.gz abrt-fdce1d751b45bbd0210b45989f4f4c0e092683dc.tar.xz abrt-fdce1d751b45bbd0210b45989f4f4c0e092683dc.zip |
better logging of package and hash checks
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon/MiddleWare.cpp')
-rw-r--r-- | src/Daemon/MiddleWare.cpp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 5235c172..b597a411 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -575,29 +575,35 @@ static mw_result_t SavePackageDescriptionToDebugDump(const char *pExecutable, } else { - package = GetPackage(pExecutable); + char *rpm_pkg = GetPackage(pExecutable); + if (rpm_pkg == NULL) + { + log("Executable '%s' doesn't belong to any package", pExecutable); + return MW_PACKAGE_ERROR; + } + + package = rpm_pkg; packageName = package.substr(0, package.rfind("-", package.rfind("-") - 1)); - if (packageName == "" || - (g_setBlackList.find(packageName) != g_setBlackList.end())) + VERB2 log("Package:'%s' short:'%s'", rpm_pkg, packageName.c_str()); + free(rpm_pkg); + + if (g_setBlackList.find(packageName) != g_setBlackList.end()) { - if (packageName == "") - { - error_msg("Executable doesn't belong to any package"); - return MW_PACKAGE_ERROR; - } - log("Blacklisted package"); + log("Blacklisted package '%s'", packageName.c_str()); return MW_BLACKLISTED; } if (g_settings_bOpenGPGCheck) { if (!s_RPM.CheckFingerprint(packageName.c_str())) { - error_msg("package isn't signed with proper key"); + log("Package '%s' isn't signed with proper key", packageName.c_str()); return MW_GPG_ERROR; } if (!CheckHash(packageName.c_str(), pExecutable)) { - error_msg("executable has bad hash"); + error_msg("Executable '%s' seems to be modified, " + "doesn't match one from package '%s'", + pExecutable, packageName.c_str()); return MW_GPG_ERROR; } } |