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_iso.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_iso.c')
| -rw-r--r-- | libxrdp/xrdp_iso.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c index fa7a3f1a..b89e1616 100644 --- a/libxrdp/xrdp_iso.c +++ b/libxrdp/xrdp_iso.c @@ -20,6 +20,7 @@ */ #include "libxrdp.h" +#include "log.h" #define LOG_LEVEL 1 #define LLOG(_level, _args) \ @@ -97,7 +98,9 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self) case PROTOCOL_HYBRID: case PROTOCOL_HYBRID_EX: default: - if (self->requestedProtocol & PROTOCOL_SSL) + if ((self->requestedProtocol & PROTOCOL_SSL) && + g_file_exist(client_info->certificate) && + g_file_exist(client_info->key_file)) { /* that's a patch since we don't support CredSSP for now */ self->selectedProtocol = PROTOCOL_SSL; @@ -109,8 +112,8 @@ xrdp_iso_negotiate_security(struct xrdp_iso *self) break; } - LLOGLN(10, ("xrdp_iso_negotiate_security: server security layer %d , client security layer %d", - self->selectedProtocol, self->requestedProtocol)); + log_message(LOG_LEVEL_DEBUG, "Security layer: requested %d, selected %d", + self->requestedProtocol, self->selectedProtocol); return rv; } |