From 6a40815e6534379a88acced3a2fd14a19382235d Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Wed, 26 Oct 2016 17:53:11 +0300 Subject: [PATCH] purple: full debug when unsafe flag is enabled If supported by the libpurple API we now use purple_debug_is_unsafe() as the flag to indicate full debugging. This can be enabled by calling pidgin like this PURPLE_UNSAFE_DEBUG=1 pidgin ... This means that message contents, which can contain secret information, will only be dumped to the debug log if enabled explicitly by the user. --- src/purple/purple-debug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/purple/purple-debug.c b/src/purple/purple-debug.c index b5031793..0075ee43 100644 --- a/src/purple/purple-debug.c +++ b/src/purple/purple-debug.c @@ -37,8 +37,10 @@ */ gboolean AIDebugLoggingIsEnabled(void); #define SIPE_PURPLE_DEBUG_IS_ENABLED AIDebugLoggingIsEnabled() +#define SIPE_PURPLE_DEBUG_IS_UNSAFE AIDebugLoggingIsEnabled() #elif !PURPLE_VERSION_CHECK(2,6,0) && !PURPLE_VERSION_CHECK(3,0,0) #define SIPE_PURPLE_DEBUG_IS_ENABLED purple_debug_is_enabled() +#define SIPE_PURPLE_DEBUG_IS_UNSAFE purple_debug_is_enabled() #else /* * The same problem happens when a client uses PurpleDebugUiOps->debug() @@ -49,6 +51,7 @@ gboolean AIDebugLoggingIsEnabled(void); #define SIPE_PURPLE_DEBUG_IS_ENABLED (purple_debug_is_enabled() || \ purple_debug_is_verbose() || \ purple_debug_is_unsafe()) +#define SIPE_PURPLE_DEBUG_IS_UNSAFE purple_debug_is_unsafe() #endif void sipe_backend_debug_literal(sipe_debug_level level, @@ -95,7 +98,7 @@ void sipe_backend_debug(sipe_debug_level level, gboolean sipe_backend_debug_enabled(void) { - return SIPE_PURPLE_DEBUG_IS_ENABLED; + return SIPE_PURPLE_DEBUG_IS_UNSAFE; } /* -- 2.11.4.GIT