summaryrefslogtreecommitdiffstats
path: root/src/Daemon
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-11-03 20:26:14 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2009-11-03 20:26:14 +0100
commit7ea8edef92be0c7812699d3e9d9a20bad8227ef3 (patch)
treeddfccb0151e6c3e7e0838559ca7c4d025ab448b3 /src/Daemon
parent4c5a40576d23057291810229b7229771a295a52c (diff)
downloadabrt-7ea8edef92be0c7812699d3e9d9a20bad8227ef3.tar.gz
abrt-7ea8edef92be0c7812699d3e9d9a20bad8227ef3.tar.xz
abrt-7ea8edef92be0c7812699d3e9d9a20bad8227ef3.zip
lib/Plugins/Bugzilla: sanitize xmlrpc init; fix bug where ssl_verify=1 always
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'src/Daemon')
-rw-r--r--src/Daemon/Daemon.cpp13
-rw-r--r--src/Daemon/Makefile.am4
2 files changed, 14 insertions, 3 deletions
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index ef78c6a6..af4f9dc5 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -18,11 +18,13 @@
*/
#include <syslog.h>
-#include <sys/inotify.h>
-#include <glib.h>
#include <pthread.h>
#include <string>
#include <limits.h>
+#include <sys/inotify.h>
+#include <xmlrpc-c/base.h>
+#include <xmlrpc-c/client.h>
+#include <glib.h>
#if HAVE_CONFIG_H
#include <config.h>
#endif
@@ -762,6 +764,13 @@ int main(int argc, char** argv)
try
{
init_daemon_logging(&watcher);
+
+ VERB1 log("Initializing XML-RPC library");
+ xmlrpc_env env;
+ xmlrpc_env_init(&env);
+ xmlrpc_client_setup_global_const(&env);
+ if (env.fault_occurred)
+ error_msg_and_die("XML-RPC Fault: %s(%d)", env.fault_string, env.fault_code);
VERB1 log("Creating glib main loop");
pMainloop = g_main_loop_new(NULL, FALSE);
/* Watching DEBUG_DUMPS_DIR for new files... */
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 0067e5dd..4365a0c9 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -24,13 +24,15 @@ abrtd_CPPFLAGS = \
-DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
+ $(XMLRPC_CFLAGS) $(XMLRPC_CLIENT_CFLAGS) \
$(ENABLE_SOCKET_OR_DBUS) \
-D_GNU_SOURCE
abrtd_LDADD = \
../../lib/Utils/libABRTUtils.la \
$(DL_LIBS) \
$(DBUS_LIBS) \
- $(RPM_LIBS)
+ $(RPM_LIBS) \
+ $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS)
dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/
dist_dbusabrtconf_DATA = dbus-abrt.conf