Display PAM error in gateway setup, use domain name as IP/DNS, changed how the socket is closed

1 files changed, 12 insertions, 1 deletions

diff --git a/xrdp/xrdp_login_wnd.c b/xrdp/xrdp_login_wnd.c
index fc4cf125..08abfedb 100644
--- a/xrdp/xrdp_login_wnd.c
+++ b/xrdp/xrdp_login_wnd.c
@@ -315,7 +315,18 @@ xrdp_wm_show_edits(struct xrdp_wm *self, struct xrdp_bitmap *combo)
                 {
                     self->login_window->focused_control = b;
                 }
-
+		/*Use the domain name as the destination IP/DNS
+		 This is useful in a gateway setup.*/
+		if (g_strncmp(name, "ip", 255) == 0)
+		{
+		    /* If the first char in the domain name is '_' we use the domain name as IP*/
+		    if(self->session->client_info->domain[0]=='_')
+		    {
+			g_strncpy(b->caption1, &self->session->client_info->domain[1], 255);
+			b->edit_pos = g_mbstowcs(0, b->caption1, 0);
+		    }
+		    
+		}
                 if (g_strncmp(name, "username", 255) == 0)
                 {
                     g_strncpy(b->caption1, self->session->client_info->username, 255);