From fe69d2f07bf13e5df13382e1f088f05fe70d5de4 Mon Sep 17 00:00:00 2001 From: ArvidNorr Date: Fri, 1 Feb 2013 10:00:39 +0100 Subject: Comments and debug when blocking channels added. Fix for potential vulnerability in log.c --- libxrdp/xrdp_rdp.c | 6 +++--- libxrdp/xrdp_sec.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'libxrdp') diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index eff2a654..7136e36a 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -114,17 +114,17 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) } else { - g_writeln("Warning: Your configured crypt level is" + log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured crypt level is" "undefined 'high' will be used"); client_info->crypt_level = 3; } } - else if (g_strcasecmp(item, "channel_code") == 0) + else if (g_strcasecmp(item, "allow_channels") == 0) { client_info->channel_code = text2bool(value); if (client_info->channel_code == 0) { - g_writeln("Info: All channels are disabled"); + log_message(LOG_LEVEL_DEBUG,"Info - All channels are disabled"); } } else if (g_strcasecmp(item, "max_bpp") == 0) diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index 17348274..2cc2d424 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -19,6 +19,7 @@ */ #include "libxrdp.h" +#include "log.h" /* some compilers need unsigned char to avoid warnings */ static tui8 g_pad_54[40] = @@ -1056,7 +1057,7 @@ xrdp_sec_incoming(struct xrdp_sec *self) if (file_by_name_read_section(key_file, "keys", items, values) != 0) { /* this is a show stopper */ - g_writeln("xrdp_sec_incoming: error reading %s file", key_file); + log_message(LOG_LEVEL_ALWAYS,"XRDP cannot read file: %s (check permissions)", key_file); list_delete(items); list_delete(values); return 1; -- cgit v1.2.1