summaryrefslogtreecommitdiffstats
path: root/xrdp
diff options
context:
space:
mode:
Diffstat (limited to 'xrdp')
-rw-r--r--xrdp/xrdp_listen.c28
-rw-r--r--xrdp/xrdp_mm.c13
-rw-r--r--xrdp/xrdp_wm.c8
3 files changed, 8 insertions, 41 deletions
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index 704fc214..e31c5405 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -19,6 +19,7 @@
*/
#include "xrdp.h"
+#include "log.h"
/* 'g_process' is protected by the semaphore 'g_process_sem'. One thread sets
g_process and waits for the other to process it */
@@ -198,40 +199,19 @@ xrdp_listen_get_port_address(char *port, int port_bytes,
if (g_strcasecmp(val, "fork") == 0)
{
val = (char *)list_get_item(values, index);
-
- if ((g_strcasecmp(val, "yes") == 0) ||
- (g_strcasecmp(val, "on") == 0) ||
- (g_strcasecmp(val, "true") == 0) ||
- (g_atoi(val) != 0))
- {
- startup_param->fork = 1;
- }
+ startup_param->fork = text2bool(val);
}
if (g_strcasecmp(val, "tcp_nodelay") == 0)
{
val = (char *)list_get_item(values, index);
-
- if ((g_strcasecmp(val, "yes") == 0) ||
- (g_strcasecmp(val, "on") == 0) ||
- (g_strcasecmp(val, "true") == 0) ||
- (g_atoi(val) != 0))
- {
- *tcp_nodelay = 1 ;
- }
+ *tcp_nodelay = text2bool(val);
}
if (g_strcasecmp(val, "tcp_keepalive") == 0)
{
val = (char *)list_get_item(values, index);
-
- if ((g_strcasecmp(val, "yes") == 0) ||
- (g_strcasecmp(val, "on") == 0) ||
- (g_strcasecmp(val, "true") == 0) ||
- (g_atoi(val) != 0))
- {
- *tcp_keepalive = 1 ;
- }
+ *tcp_keepalive = text2bool(val);
}
}
}
diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c
index 28b83ad0..90127c4b 100644
--- a/xrdp/xrdp_mm.c
+++ b/xrdp/xrdp_mm.c
@@ -2149,7 +2149,7 @@ find_name_in_lists(char *inName, struct list *names)
for (index = 0; index < names->count; index++)
{
name = (char *)list_get_item(names, index);
- if ( (name != 0) && g_strncmp(name, inName, MAX_CHANNEL_NAME))
+ if ( (name != 0) && (g_strncmp(name, inName, MAX_CHANNEL_NAME) == 0) )
{
reply = index;
break; /* stop loop - item found*/
@@ -2173,15 +2173,8 @@ is_channel_enabled(char *inName, struct list *names, struct list *values)
if ( index >= 0 )
{
val = (char *)list_get_item(values, index);
-
- if ((g_strcasecmp(val, "yes") == 0) ||
- (g_strcasecmp(val, "on") == 0) ||
- (g_strcasecmp(val, "true") == 0) ||
- (g_atoi(val) != 0))
- {
- reply = 1;
- }
- else
+ reply = text2bool(val);
+ if (reply == 0)
{
g_writeln("This channel is disabled: %s", name);
}
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 502eab94..e67bdff9 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -444,13 +444,7 @@ xrdp_wm_load_static_colors_plus(struct xrdp_wm *self, char *autorun_name)
else if (g_strcasecmp(val, "hidelogwindow") == 0)
{
val = (char *)list_get_item(values, index);
-
- if ((g_strcasecmp(val, "yes") == 0) ||
- (g_strcasecmp(val, "1") == 0) ||
- (g_strcasecmp(val, "true") == 0))
- {
- self->hide_log_window = 1;
- }
+ self->hide_log_window = text2bool(val);
}
else if (g_strcasecmp(val, "pamerrortxt") == 0)
{