From 56fe9613495d6eabd2a170035b44098b961fe3f9 Mon Sep 17 00:00:00 2001 From: Jaroslaw Osmanski Date: Fri, 8 Mar 2019 08:42:18 +0100 Subject: [PATCH] Fixed style and format issues. --- sesman/chansrv/chansrv.c | 6 ++++-- sesman/config.c | 3 +-- sesman/config.h | 14 +++++++------- sesman/session.c | 3 ++- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c index 3d5ed08f..04a73000 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -1793,8 +1793,10 @@ main(int argc, char **argv) } restrict_outbound_clipboard_env = g_getenv("CHANSRV_RESTRICT_OUTBOUND_CLIPBOARD"); - if (restrict_outbound_clipboard_env != 0) { - if (g_strcmp(restrict_outbound_clipboard_env, "1") == 0) { + if (restrict_outbound_clipboard_env != 0) + { + if (g_strcmp(restrict_outbound_clipboard_env, "1") == 0) + { g_restrict_outbound_clipboard = 1; } } diff --git a/sesman/config.c b/sesman/config.c index a42bb47f..1639517d 100644 --- a/sesman/config.c +++ b/sesman/config.c @@ -275,12 +275,11 @@ config_read_security(int file, struct config_security *sc, sc->ts_always_group_check = g_text2bool((char *)list_get_item(param_v, i)); } - if (0 == g_strcasecmp(buf, SESMAN_CFG_RESTRICT_CLIPBOARD)) + if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_RESTRICT_OUTBOUND_CLIPBOARD)) { sc->restrict_outbound_clipboard = g_text2bool((char *)list_get_item(param_v, i)); } - } return 0; diff --git a/sesman/config.h b/sesman/config.h index b8e8bc76..d465687f 100644 --- a/sesman/config.h +++ b/sesman/config.h @@ -54,13 +54,13 @@ #define SESMAN_CFG_LOG_ENABLE_SYSLOG "EnableSyslog" #define SESMAN_CFG_LOG_SYSLOG_LEVEL "SyslogLevel" */ -#define SESMAN_CFG_SECURITY "Security" -#define SESMAN_CFG_SEC_LOGIN_RETRY "MaxLoginRetry" -#define SESMAN_CFG_SEC_ALLOW_ROOT "AllowRootLogin" -#define SESMAN_CFG_SEC_USR_GROUP "TerminalServerUsers" -#define SESMAN_CFG_SEC_ADM_GROUP "TerminalServerAdmins" -#define SESMAN_CFG_SEC_ALWAYSGROUPCHECK "AlwaysGroupCheck" -#define SESMAN_CFG_RESTRICT_CLIPBOARD "RestrictOutboundClipboard" +#define SESMAN_CFG_SECURITY "Security" +#define SESMAN_CFG_SEC_LOGIN_RETRY "MaxLoginRetry" +#define SESMAN_CFG_SEC_ALLOW_ROOT "AllowRootLogin" +#define SESMAN_CFG_SEC_USR_GROUP "TerminalServerUsers" +#define SESMAN_CFG_SEC_ADM_GROUP "TerminalServerAdmins" +#define SESMAN_CFG_SEC_ALWAYSGROUPCHECK "AlwaysGroupCheck" +#define SESMAN_CFG_SEC_RESTRICT_OUTBOUND_CLIPBOARD "RestrictOutboundClipboard" #define SESMAN_CFG_SESSIONS "Sessions" #define SESMAN_CFG_SESS_MAX "MaxSessions" diff --git a/sesman/session.c b/sesman/session.c index b437cfd4..9fab0392 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -374,7 +374,8 @@ session_start_chansrv(char *username, int display) g_cfg->env_names, g_cfg->env_values); - if (g_cfg->sec.restrict_outbound_clipboard == 1) { + if (g_cfg->sec.restrict_outbound_clipboard == 1) + { g_setenv("CHANSRV_RESTRICT_OUTBOUND_CLIPBOARD", "1", 1); }