Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 ldm (2:2.2.18-1) unstable; urgency=medium
 .
   * New upstream version.
     - Display LDM only in the first monitor (LP: #693151).
     - DesktopNames replaced X-LightDM-DesktopName in xsession files
       (GNOME: #727546).
     - Fix invalid syntax in .dmrc parsing the default session.
 .
   * debian/control: Update Vcs-Browser to use https URL.
Author: Vagrant Cascadian <vagrant@debian.org>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/693151

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- ldm-2.2.18.orig/src/logging.c
+++ ldm-2.2.18/src/logging.c
@@ -29,10 +29,14 @@
 #include "logging.h"
 
 FILE *logfile = NULL;
-char *LOG_LEVEL_NAMES[] = { "EMERGENCY", "ALERT", "CRITICAL", "ERROR",
-    "WARNING", "NOTICE", "INFO", "DEBUG"
-};
-
+char *LOG_LEVEL_NAMES[] = { "EMERGENCY", /* 0 */
+                            "ALERT",     /* 1 */
+                            "CRITICAL",  /* 2 */
+                            "ERROR",     /* 3 */
+                            "WARNING",   /* 4 */
+                            "NOTICE",    /* 5 */
+                            "INFO",      /* 6 */
+                            "DEBUG" };   /* 7 */
 int loglevel = 0;
 
 /*
--- ldm-2.2.18.orig/src/plugins/ssh/ssh.c
+++ ldm-2.2.18/src/plugins/ssh/ssh.c
@@ -290,7 +290,7 @@ expect(int fd, char *p, int seconds, ...
     char buffer[BUFSIZ];
     gchar *arg;
     GPtrArray *expects;
-    int loopcount = seconds;
+    int loopcount = seconds * 5;
     int loopend = 0;
 
     bzero(p, MAXEXP);
@@ -313,60 +313,107 @@ expect(int fd, char *p, int seconds, ...
     /*
      * Main loop.
      */
-
+    log_entry("ssh",7,"expect: entering main loop");
     while (1) {
-        timeout.tv_sec = (long) 1;               /* one second timeout */
-        timeout.tv_usec = 0;
+//        timeout.tv_sec = (long) 1;               /* one second timeout */
+//        timeout.tv_usec = 0;
+        timeout.tv_sec  = 0;
+        timeout.tv_usec = 200000; /* 200ms timeout */
 
         FD_ZERO(&set);
         FD_SET(fd, &set);
         st = select(FD_SETSIZE, &set, NULL, NULL, &timeout);
 
-        if (st == -1 && errno == EINTR)
-        {
-            continue;                            /* interrupted by signal -> retry */
-        }
-
-        if (st < 0) {                            /* bad thing */
-            break;
-        }
-
-        if (loopcount == 0) {
-            break;
-        }
-
-        if (!st) {                               /* timeout */
-            loopcount--;                         /* We've not seen the data we want */
-            continue;
-        }
-
-        size = read(fd, buffer, sizeof buffer);
-        if (size <= 0) {
-            break;
-        }
+	log_entry("ssh", 7, "expect: select returned %d", st);
 
-        if ((total + size) < MAXEXP) {
-            strncpy(p + total, buffer, size);
-            total += size;
-        }
+//        if (st == -1 && errno == EINTR)
+//        {
+//            continue;                            /* interrupted by signal -> retry */
+//        }
+
+//        if (st < 0) {                            /* bad thing */
+//            break;
+//        }
+
+//        if (loopcount == 0) {
+//            break;
+//        }
+
+//        if (!st) {                               /* timeout */
+//            loopcount--;                         /* We've not seen the data we want */
+//            continue;
+//        }
+
+        /* There is data available - we want to read it in even if
+         * the child process has exited - we want to get the error
+         * message
+         */
+	if (st > 0)
+	{
+        	size = read(fd, buffer, sizeof buffer);
+
+		if (size < 0) {
+		    log_entry("ssh", 3, "expect: read returned error %d (%s)", errno, strerror(errno));
+		    break;
+		}
+		if (size == 0) {
+                	log_entry("ssh", 3, "expect: read returned 0 (EOF))");
+                	break;
+            	}
+
+		if ((total + size) < MAXEXP) {
+		    strncpy(p + total, buffer, size);
+		    total += size;
+                    log_entry("ssh", 7, "expect: got %d bytes so far", total);
+		}
+		else
+            	{
+                	log_entry("ssh", 3, "expect: buffer full");
+                	return ERROR;
+            	}
+	}
+	else /* No data available */
+        {
+            /* select() was interrupted by a signal,
+             * most likely SIGCHLD. Just try again */
+            if (st == -1 && errno == EINTR)
+            {
+                log_entry("ssh", 7, "expect: retrying");
+                continue;
+            }
+            else if (st == -1) {        /* other errors */
+                log_entry("ssh", 3, "expect: select returned error %d (%s)", errno, strerror(errno));
+                break;
+            }
+            /* st == 0 and there was no data for 200ms */
 
-        if (child_exited) {
-            break;                               /* someone died on us */
-        }
+            if (child_exited) {         /* someone died on us */
+                log_entry("ssh", 3, "expect: ssh process has died");
+                break;
+            }
 
-        for (i = 0; i < expects->len; i++) {
-            if (strstr(p, g_ptr_array_index(expects, i))) {
-                loopend = TRUE;
+            if (loopcount == 0) {
+                log_entry("ssh", 3, "expect: timed out after %d seconds", seconds);
                 break;
             }
-        }
+      
+
+            for (i = 0; i < expects->len; i++) {
+            	if (strstr(p, g_ptr_array_index(expects, i))) {
+			log_entry("ssh", 7, "expect: found string %d \"%s\"", i, g_ptr_array_index(expects, i));
+               		loopend = TRUE;
+                	break;
+            	}
+            }
+	    loopcount--;            /* We've not seen the data we want */
+	}
 
         if (loopend) {
             break;
         }
     }
 
-    log_entry("ldm", 7, "expect saw: %s", p);
+    log_entry("ssh",7,"expect: saw: %s", p);
 
     if (size < 0 || st < 0) {
         return ERROR;                            /* error occured */
@@ -388,6 +435,7 @@ void
 ssh_chat(gint fd)
 {
     int seen;
+    size_t len;
     gchar lastseen[MAXEXP];
     int first_time = 1;
 
@@ -418,26 +466,34 @@ ssh_chat(gint fd)
             /* If it's not the first time through, or the :'s not at the
              * end of a line (password expiry or error), set the message */
             if ((!first_time) || (lastseen[i - 1] != ':')) {
+                log_entry("ssh", 4, "ssh_chat: ssh returned \"%d\"", lastseen);
                 set_message(lastseen);
             }
             /* If ':' *IS* the last character on the line, we'll assume a
              * password prompt is presented, and get a password */
             if (lastseen[i - 1] == ':') {
+                log_entry("ssh", 7, "ssh_chat: writing password");
                 write(fd, sshinfo->password, strlen(sshinfo->password));
                 write(fd, "\n", 1);
             }
             first_time = 0;
         } else if (seen < 0) {
-            if (i > 0) {
-                log_entry("ssh", 3, "ssh returned: %s", lastseen);
-                set_message(lastseen);
+            log_entry("ssh", 3, "ssh_chat: expect returned error %d", seen);
+            g_strstrip(lastseen);
+            len = strlen(lastseen);
+            if (len > 0)
+            {
+                log_entry("ssh", 3, "ssh_chat: ssh returned \"%s\"", lastseen);
+                set_message(_(lastseen));
             }
-            else {
+            else
+            {
+                log_entry("ssh", 3, "ssh_chat: did not get an error message from ssh");
                 set_message(_("No response from server, restarting..."));
             }
             sleep(5);
             close_greeter();
-            die("ssh", "no response, restarting");
+            die("ssh","login failed, restarting");
         }
     }
 }