Merge pull request #1872 from metalefty/neutrinordp-logmaster

neutrinordp: avoid pampassword leakage

1 files changed, 15 insertions, 1 deletions

diff --git a/neutrinordp/xrdp-neutrinordp.c b/neutrinordp/xrdp-neutrinordp.c
index cc267827..0a767d23 100644
--- a/neutrinordp/xrdp-neutrinordp.c
+++ b/neutrinordp/xrdp-neutrinordp.c
@@ -443,7 +443,15 @@ lxrdp_set_param(struct mod *mod, const char *name, const char *value)
 {
     rdpSettings *settings;
 
-    LOG_DEVEL(LOG_LEVEL_DEBUG, "lxrdp_set_param: name [%s] value [%s]", name, value);
+    if (g_strcmp(name, "password") == 0 || g_strcmp(name, "pampassword") == 0)
+    {
+        LOG_DEVEL(LOG_LEVEL_DEBUG, "lxrdp_set_param: name [%s] value [******]", name);
+    }
+    else
+    {
+        LOG_DEVEL(LOG_LEVEL_DEBUG, "lxrdp_set_param: name [%s] value [%s]", name, value);
+    }
+
     settings = mod->inst->settings;
 
     if (g_strcmp(name, "hostname") == 0)
@@ -496,6 +504,12 @@ lxrdp_set_param(struct mod *mod, const char *name, const char *value)
     {
         settings->desktop_resize = g_text2bool(value);
     }
+    else if (g_strcmp(name, "pamusername") == 0 ||
+             g_strcmp(name, "pampassword") == 0 ||
+             g_strcmp(name, "pammsessionmng") == 0)
+    {
+        /* Valid (but unused) parameters not logged */
+    }
     else
     {
         LOG(LOG_LEVEL_WARNING, "lxrdp_set_param: unknown name [%s] value [%s]", name, value);