diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-10-16 22:07:34 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-10-17 08:38:22 -0700 |
| commit | 9ac592b21853dc6bbb9cd07e9ab0724a83153efd (patch) | |
| tree | a0a558891513926d26be61ca38921526bce5517e | |
| parent | acdfc94511985c5c4369fc650c9f3bb3773dc2e3 (diff) | |
| download | xrdp-proprietary-9ac592b21853dc6bbb9cd07e9ab0724a83153efd.tar.gz xrdp-proprietary-9ac592b21853dc6bbb9cd07e9ab0724a83153efd.zip | |
Don't use term "missing" when using default files, it's too alarming
Also improve messages when non-absolute path is rejected.
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index 3cb075b3..6aff5830 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -197,8 +197,8 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) /* default certificate path */ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH); log_message(LOG_LEVEL_INFO, - "Missing definition of X.509 certificate, use " - "default instead: %s", client_info->certificate); + "Using default X.509 certificate: %s", + client_info->certificate); } else if (value[0] != '/') @@ -206,7 +206,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) /* default certificate path */ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH); log_message(LOG_LEVEL_WARNING, - "No absolute path to X.509 certificate, use " + "X.509 certificate should use absolute path, using " "default instead: %s", client_info->certificate); } else @@ -222,16 +222,15 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) { /* default key_file path */ g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); - log_message(LOG_LEVEL_INFO, - "Missing definition of X.509 key file, use " - "default instead: %s", client_info->key_file); + log_message(LOG_LEVEL_INFO, "Using default X.509 key file: %s", + client_info->key_file); } else if (value[0] != '/') { /* default key_file path */ g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); log_message(LOG_LEVEL_WARNING, - "No absolute path to X.509 key file, use" + "X.509 key file should use absolute path, using " "default instead: %s", client_info->key_file); } else |