jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use term "missing" when using default files, it's too alarming

Browse Source 
Also improve messages when non-absolute path is rejected.
This commit is contained in:
Pavel Roskin 2016-10-16 22:07:34 -07:00
parent acdfc94511
commit 9ac592b218
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libxrdp/xrdp_rdp.c
View File

@ -197,8 +197,8 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
/* default certificate path */ /* default certificate path */
g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH); g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH);
log_message(LOG_LEVEL_INFO, log_message(LOG_LEVEL_INFO,
"Missing definition of X.509 certificate, use " "Using default X.509 certificate: %s",
"default instead: %s", client_info->certificate); client_info->certificate);
} }
else if (value[0] != '/') else if (value[0] != '/')
@ -206,7 +206,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
/* default certificate path */ /* default certificate path */
g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH); g_snprintf(client_info->certificate, 1023, "%s/cert.pem", XRDP_CFG_PATH);
log_message(LOG_LEVEL_WARNING, 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); "default instead: %s", client_info->certificate);
} }
else else
@ -222,16 +222,15 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
{ {
/* default key_file path */ /* default key_file path */
g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH);
log_message(LOG_LEVEL_INFO, log_message(LOG_LEVEL_INFO, "Using default X.509 key file: %s",
"Missing definition of X.509 key file, use " client_info->key_file);
"default instead: %s", client_info->key_file);
} }
else if (value[0] != '/') else if (value[0] != '/')
{ {
/* default key_file path */ /* default key_file path */
g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH);
log_message(LOG_LEVEL_WARNING, 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); "default instead: %s", client_info->key_file);
} }
else else