[Pkg-ltsp-devel] Bug#462764: login through ldm using ssh-key authentication takes more than 2 min

[SZABO Zsolt]

Package: ldm
Version: 0.1~bzr20071217
Severity: normal
Tags: patch

ssh-key authentication does not send password: prompt which is expected by
ssh_chat() function
this patch fixes the problem:

--- ldm-0.1~bzr20071217/src/sshutils.c	2007-12-18 01:36:18.000000000 +0100
+++ ldm-0.1~bzr20071217.new/src/sshutils.c	2008-01-24 15:25:43.000000000 +0100
@@ -167,6 +167,7 @@
         fprintf(ldmlog, "ssh_chat: looking for ssword: from ssh\n");
         seen = expect(fd, 30.0, "ssword:",
                                 "continue connecting",
+				SENTINEL,	/* for ssh-key auth: no passwd */
                                 NULL);
         if (seen == 1) {
             fprintf(ldmlog, "ssh_chat: got it!  Sending pw\n");
@@ -178,6 +179,9 @@
                 set_message(_("This workstation isn't authorized to connect to server"));
             sleep(5);
             die("Terminal not authorized, run ltsp-update-sshkeys\n");
+        } else if (seen == 3) {
+            fprintf(ldmlog, "Saw sentinel. Logged in successfully\n");
+            return 0;
         } else  {
             die("Unexpected text from ssh session.  Exiting\n");
         }


-- System Information:
Debian Release: 4.0
  APT prefers proposed-updates
  APT policy: (500, 'proposed-updates'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-5-686
Locale: LANG=hu_HU, LC_CTYPE=hu_HU (charmap=ISO-8859-2)