[Pkg-ltsp-devel] Bug#490897: ldm: tcsh logins

[Vagrant Cascadian]

tags 490897 pending
thanks

On Wed, Aug 13, 2008 at 09:34:03PM +0200, Daniel Nilsson wrote:
> On Fri, Aug 08, 2008 at 02:59:57PM -0700, Vagrant Cascadian wrote:
> --- ldm-2.0.9.orig/src/ldm.c
> +++ ldm-2.0.9/src/ldm.c
> @@ -268,7 +268,7 @@
>       * FIXME: ditch the kill -1 and use ssh -o exit on the control socket
>       */
>      command = g_strjoin(" ", "ssh", "-Y", "-t", "-S", ldm.control_socket,
> -            "-l", ldm.username, ldm.server, client_env,
> +            "-l", ldm.username, ldm.server, "env" ,client_env,
>              lang ? lang : "", display ? display : "", sound ? sound : "",
>              ldm.session, localdev ? localdev : "",
>              "; kill -1 $PPID", NULL);

based on this patch, i made a patch for ldm 2.0.6 that will hopefully
find it's way into lenny. tested it with bash, tcsh, zsh, dash and posh
as the default shell.

attached is a dpatch formatted patch that you should be able to drop
into ldm-2.0.6/debian/patches, and then add it to debian/patches/00list,
and it should build.

it should also hopefully work for the etch backport, though i haven't
tested that.

live well,
  vagrant
-------------- next part --------------
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-tcsh-logins.dpatch by Vagrant Cascadian <vagrant at freegeek.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: prepend the env command to login shells, which allows users with tcsh as
## DP: the default shell to login. 
## DP: based on patch from Daniel Nilsson: http://bugs.debian.org/490897

@DPATCH@
diff -urNad ldm-2.0.6~/src/ldm.c ldm-2.0.6/src/ldm.c
--- ldm-2.0.6~/src/ldm.c	2008-05-30 15:41:45.000000000 -0700
+++ ldm-2.0.6/src/ldm.c	2008-08-13 15:51:45.000000000 -0700
@@ -258,6 +258,7 @@
     cmd[i++] = "-l";
     cmd[i++] = ldminfo.username;
     cmd[i++] = ldminfo.server;
+    cmd[i++] = "env";
     cmd[i++] = ltspclienv;
 
     /*
diff -urNad ldm-2.0.6~/src/sshutils.c ldm-2.0.6/src/sshutils.c
--- ldm-2.0.6~/src/sshutils.c	2008-05-30 15:41:45.000000000 -0700
+++ ldm-2.0.6/src/sshutils.c	2008-08-13 15:54:13.000000000 -0700
@@ -68,6 +68,7 @@
     sshcmd[i++] = "echo";
     sshcmd[i++] = SENTINEL;
     sshcmd[i++] = ";";
+    sshcmd[i++] = "env";
     sshcmd[i++] = "LANG=C";
     sshcmd[i++] = "/bin/sh";
     sshcmd[i++] = "-";