diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2013-01-17 12:30:17 -0800 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2013-01-17 12:30:17 -0800 |
| commit | ffc7e7ff270134c7f5c73f8f86cac81038e8fee3 (patch) | |
| tree | fdb57b1ee4bf75dad7ff3fef60bca09dceafe93a /libxrdp/xrdp_rdp.c | |
| parent | e632bc794bdafb8ea025396807e107a1e4b751af (diff) | |
| parent | bdc678bdc3b986ea91e433d691bb7b963e0d420f (diff) | |
| download | xrdp-proprietary-ffc7e7ff270134c7f5c73f8f86cac81038e8fee3.tar.gz xrdp-proprietary-ffc7e7ff270134c7f5c73f8f86cac81038e8fee3.zip | |
Merge pull request #52 from Osirium/patch/text2bool
Patch/text2bool - use common function when converting string to bool
Diffstat (limited to 'libxrdp/xrdp_rdp.c')
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 264f6096..eff2a654 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -19,6 +19,7 @@ */ #include "libxrdp.h" +#include "log.h" #if defined(XRDP_FREERDP1) #include <freerdp/codec/rfx.h> @@ -87,30 +88,15 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) if (g_strcasecmp(item, "bitmap_cache") == 0) { - if ((g_strcasecmp(value, "yes") == 0) || - (g_strcasecmp(value, "true") == 0) || - (g_strcasecmp(value, "1") == 0)) - { - client_info->use_bitmap_cache = 1; - } + client_info->use_bitmap_cache = text2bool(value); } else if (g_strcasecmp(item, "bitmap_compression") == 0) { - if (g_strcasecmp(value, "yes") == 0 || - g_strcasecmp(value, "true") == 0 || - g_strcasecmp(value, "1") == 0) - { - client_info->use_bitmap_comp = 1; - } + client_info->use_bitmap_comp = text2bool(value); } else if (g_strcasecmp(item, "bulk_compression") == 0) { - if (g_strcasecmp(value, "yes") == 0 || - g_strcasecmp(value, "true") == 0 || - g_strcasecmp(value, "1") == 0) - { - client_info->use_bulk_comp = 1; - } + client_info->use_bulk_comp = text2bool(value); } else if (g_strcasecmp(item, "crypt_level") == 0) { @@ -135,13 +121,8 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) } else if (g_strcasecmp(item, "channel_code") == 0) { - if ((g_strcasecmp(value, "yes") == 0) || - (g_strcasecmp(value, "1") == 0) || - (g_strcasecmp(value, "true") == 0)) - { - client_info->channel_code = 1; - } - else + client_info->channel_code = text2bool(value); + if (client_info->channel_code == 0) { g_writeln("Info: All channels are disabled"); } |