|
Jiri Moskovcak |
b87d8a |
diff -urp abrt-1.1.13/lib/Plugins/CCpp.cpp abrt-1.1.13_nopolkit/lib/Plugins/CCpp.cpp
|
|
Jiri Moskovcak |
b87d8a |
--- abrt-1.1.13/lib/Plugins/CCpp.cpp 2010-07-28 15:35:14.000000000 +0200
|
|
Jiri Moskovcak |
b87d8a |
+++ abrt-1.1.13_nopolkit/lib/Plugins/CCpp.cpp 2010-08-10 15:21:18.569491108 +0200
|
|
Jiri Moskovcak |
b87d8a |
@@ -28,7 +28,9 @@
|
|
Jiri Moskovcak |
b87d8a |
#include "abrt_exception.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "debug_dump.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "comm_layer_inner.h"
|
|
Jiri Moskovcak |
b87d8a |
-#include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+#if 0
|
|
Jiri Moskovcak |
b87d8a |
+ #include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+#endif
|
|
Jiri Moskovcak |
b87d8a |
#include "backtrace.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "CCpp_sha1.h"
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
@@ -675,7 +677,7 @@ string CAnalyzerCCpp::GetGlobalUUID(cons
|
|
Jiri Moskovcak |
b87d8a |
return create_hash(hash_base.c_str());
|
|
Jiri Moskovcak |
b87d8a |
}
|
|
Jiri Moskovcak |
b87d8a |
}
|
|
Jiri Moskovcak |
b87d8a |
-
|
|
Jiri Moskovcak |
b87d8a |
+#if 0
|
|
Jiri Moskovcak |
b87d8a |
static bool DebuginfoCheckPolkit(uid_t uid)
|
|
Jiri Moskovcak |
b87d8a |
{
|
|
Jiri Moskovcak |
b87d8a |
fflush(NULL);
|
|
Jiri Moskovcak |
b87d8a |
@@ -704,6 +706,7 @@ static bool DebuginfoCheckPolkit(uid_t u
|
|
Jiri Moskovcak |
b87d8a |
log("UID %d is not authorized to install debuginfos", uid);
|
|
Jiri Moskovcak |
b87d8a |
return false;
|
|
Jiri Moskovcak |
b87d8a |
}
|
|
Jiri Moskovcak |
b87d8a |
+#endif
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
void CAnalyzerCCpp::CreateReport(const char *pDebugDumpDir, int force)
|
|
Jiri Moskovcak |
b87d8a |
{
|
|
Jiri Moskovcak |
b87d8a |
@@ -738,7 +741,7 @@ void CAnalyzerCCpp::CreateReport(const c
|
|
Jiri Moskovcak |
b87d8a |
dd.Close(); /* do not keep dir locked longer than needed */
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
string build_ids;
|
|
Jiri Moskovcak |
b87d8a |
- if (m_bInstallDebugInfo && DebuginfoCheckPolkit(xatoi_u(UID.c_str())))
|
|
Jiri Moskovcak |
b87d8a |
+ if (m_bInstallDebugInfo)
|
|
Jiri Moskovcak |
b87d8a |
{
|
|
Jiri Moskovcak |
b87d8a |
if (m_nDebugInfoCacheMB > 0)
|
|
Jiri Moskovcak |
b87d8a |
trim_debuginfo_cache(m_nDebugInfoCacheMB);
|
|
Jiri Moskovcak |
b87d8a |
diff -urp abrt-1.1.13/lib/Utils/Makefile.am abrt-1.1.13_nopolkit/lib/Utils/Makefile.am
|
|
Jiri Moskovcak |
b87d8a |
--- abrt-1.1.13/lib/Utils/Makefile.am 2010-08-04 17:15:16.000000000 +0200
|
|
Jiri Moskovcak |
b87d8a |
+++ abrt-1.1.13_nopolkit/lib/Utils/Makefile.am 2010-08-10 14:54:21.779492300 +0200
|
|
Jiri Moskovcak |
b87d8a |
@@ -56,8 +56,7 @@ libABRTdUtils_la_SOURCES = \
|
|
Jiri Moskovcak |
b87d8a |
$(HEADER_DIR)/abrt_xmlrpc.h abrt_xmlrpc.cpp \
|
|
Jiri Moskovcak |
b87d8a |
abrt_rh_support.h abrt_rh_support.cpp \
|
|
Jiri Moskovcak |
b87d8a |
abrt_curl.h abrt_curl.cpp \
|
|
Jiri Moskovcak |
b87d8a |
- $(HEADER_DIR)/plugin.h Plugin.cpp \
|
|
Jiri Moskovcak |
b87d8a |
- Polkit.h Polkit.cpp
|
|
Jiri Moskovcak |
b87d8a |
+ $(HEADER_DIR)/plugin.h Plugin.cpp
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
libABRTdUtils_la_CPPFLAGS = \
|
|
Jiri Moskovcak |
b87d8a |
-Wall -Werror \
|
|
Jiri Moskovcak |
b87d8a |
Only in abrt-1.1.13/: po
|
|
Jiri Moskovcak |
b87d8a |
diff -urp abrt-1.1.13/src/Daemon/PluginManager.cpp abrt-1.1.13_nopolkit/src/Daemon/PluginManager.cpp
|
|
Jiri Moskovcak |
b87d8a |
--- abrt-1.1.13/src/Daemon/PluginManager.cpp 2010-07-19 17:44:32.000000000 +0200
|
|
Jiri Moskovcak |
b87d8a |
+++ abrt-1.1.13_nopolkit/src/Daemon/PluginManager.cpp 2010-08-10 15:20:18.288241242 +0200
|
|
Jiri Moskovcak |
b87d8a |
@@ -22,7 +22,9 @@
|
|
Jiri Moskovcak |
b87d8a |
#include "abrtlib.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "abrt_exception.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "comm_layer_inner.h"
|
|
Jiri Moskovcak |
b87d8a |
-#include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+#ifdef PLUGIN_DYNAMIC_LOAD_UNLOAD
|
|
Jiri Moskovcak |
b87d8a |
+ #include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+#endif
|
|
Jiri Moskovcak |
b87d8a |
#include "PluginManager.h"
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
using namespace std;
|
|
Jiri Moskovcak |
b87d8a |
diff -urp abrt-1.1.13/src/Daemon/Settings.cpp abrt-1.1.13_nopolkit/src/Daemon/Settings.cpp
|
|
Jiri Moskovcak |
b87d8a |
--- abrt-1.1.13/src/Daemon/Settings.cpp 2010-07-22 14:07:45.000000000 +0200
|
|
Jiri Moskovcak |
b87d8a |
+++ abrt-1.1.13_nopolkit/src/Daemon/Settings.cpp 2010-08-10 15:20:18.293241459 +0200
|
|
Jiri Moskovcak |
b87d8a |
@@ -19,7 +19,10 @@
|
|
Jiri Moskovcak |
b87d8a |
#include "Settings.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "abrtlib.h"
|
|
Jiri Moskovcak |
b87d8a |
#include "abrt_types.h"
|
|
Jiri Moskovcak |
b87d8a |
-#include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+
|
|
Jiri Moskovcak |
b87d8a |
+#if 0
|
|
Jiri Moskovcak |
b87d8a |
+ #include "Polkit.h"
|
|
Jiri Moskovcak |
b87d8a |
+#endif
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
#define SECTION_COMMON "Common"
|
|
Jiri Moskovcak |
b87d8a |
#define SECTION_ANALYZER_ACTIONS_AND_REPORTERS "AnalyzerActionsAndReporters"
|
|
Jiri Moskovcak |
b87d8a |
@@ -525,10 +528,10 @@ map_abrt_settings_t GetSettings()
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
return ABRTSettings;
|
|
Jiri Moskovcak |
b87d8a |
}
|
|
Jiri Moskovcak |
b87d8a |
-
|
|
Jiri Moskovcak |
b87d8a |
/* dbus call to change some .conf file data */
|
|
Jiri Moskovcak |
b87d8a |
void SetSettings(const map_abrt_settings_t& pSettings, const char *dbus_sender)
|
|
Jiri Moskovcak |
b87d8a |
{
|
|
Jiri Moskovcak |
b87d8a |
+#if 0
|
|
Jiri Moskovcak |
b87d8a |
int polkit_result;
|
|
Jiri Moskovcak |
b87d8a |
|
|
Jiri Moskovcak |
b87d8a |
polkit_result = polkit_check_authorization(dbus_sender,
|
|
Jiri Moskovcak |
b87d8a |
@@ -539,7 +542,7 @@ void SetSettings(const map_abrt_settings
|
|
Jiri Moskovcak |
b87d8a |
return;
|
|
Jiri Moskovcak |
b87d8a |
}
|
|
Jiri Moskovcak |
b87d8a |
log("user %s succesfully authorized", dbus_sender);
|
|
Jiri Moskovcak |
b87d8a |
-
|
|
Jiri Moskovcak |
b87d8a |
+#endif
|
|
Jiri Moskovcak |
b87d8a |
map_abrt_settings_t::const_iterator it = pSettings.find(SECTION_COMMON);
|
|
Jiri Moskovcak |
b87d8a |
map_abrt_settings_t::const_iterator end = pSettings.end();
|
|
Jiri Moskovcak |
b87d8a |
if (it != end)
|