diff options
| author | metalefty <meta@vmeta.jp> | 2016-11-29 09:51:29 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 09:51:29 +0900 |
| commit | 8b40023801ed08a63f0c5f4fb020013f7fc60ed0 (patch) | |
| tree | efb2fd0bffd299189c632dfa68f74b0cf0f21838 /libxrdp/xrdp_rdp.c | |
| parent | 679c4b35583da8080b32ece6d45ff800f6e623ac (diff) | |
| parent | d3c36b03761380f173ca691afb39e82179af11a9 (diff) | |
| download | xrdp-proprietary-8b40023801ed08a63f0c5f4fb020013f7fc60ed0.tar.gz xrdp-proprietary-8b40023801ed08a63f0c5f4fb020013f7fc60ed0.zip | |
Merge pull request #509 from proski/sec_level
Security level fixes
Diffstat (limited to 'libxrdp/xrdp_rdp.c')
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 6aff5830..dd6e6d38 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -182,10 +182,15 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) { client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID; } + else if (g_strcasecmp(value, "negotiate") == 0) + { + client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID | PROTOCOL_HYBRID_EX; + } else { - log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured security layer is " - "undefined, xrdp will negotiate client compatible"); + log_message(LOG_LEVEL_ERROR, "security_layer=%s is not " + "recognized, will use security_layer=negotiate", + value); client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID | PROTOCOL_HYBRID_EX; } } |