summaryrefslogtreecommitdiffstats
path: root/xrdp/xrdp_wm.c
diff options
context:
space:
mode:
authorArvidNorr <norrarvid@gmail.com>2013-01-31 07:17:42 -0800
committerArvidNorr <norrarvid@gmail.com>2013-01-31 07:17:42 -0800
commit9aa0cb4e61eeb253a9a1177f1162eb5289130e96 (patch)
tree2b1be914a65edd952cf3ba22ef8d338be28e83a5 /xrdp/xrdp_wm.c
parentffc7e7ff270134c7f5c73f8f86cac81038e8fee3 (diff)
parent876f356dad387d3d9b1a8382c0115857ca605e54 (diff)
downloadxrdp-proprietary-9aa0cb4e61eeb253a9a1177f1162eb5289130e96.tar.gz
xrdp-proprietary-9aa0cb4e61eeb253a9a1177f1162eb5289130e96.zip
Merge pull request #58 from ArvidNorr/pam-cont
PAM additions mostly for a gateway situation
Diffstat (limited to 'xrdp/xrdp_wm.c')
-rw-r--r--xrdp/xrdp_wm.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c
index 0a2600f2..e67bdff9 100644
--- a/xrdp/xrdp_wm.c
+++ b/xrdp/xrdp_wm.c
@@ -446,6 +446,11 @@ xrdp_wm_load_static_colors_plus(struct xrdp_wm *self, char *autorun_name)
val = (char *)list_get_item(values, index);
self->hide_log_window = text2bool(val);
}
+ else if (g_strcasecmp(val, "pamerrortxt") == 0)
+ {
+ val = (char *)list_get_item(values, index);
+ g_strncpy(self->pamerrortxt,val,255);
+ }
}
}
}
@@ -534,7 +539,12 @@ xrdp_wm_init(struct xrdp_wm *self)
names->auto_free = 1;
values = list_create();
values->auto_free = 1;
- g_strncpy(section_name, self->session->client_info->domain, 255);
+ /* domain names that starts with '_' are reserved for IP/DNS to simplify
+ * for the user in a gateway setup */
+ if(self->session->client_info->domain[0]!='_')
+ {
+ g_strncpy(section_name, self->session->client_info->domain, 255);
+ }
if (section_name[0] == 0)
{