On 2014/02/25 09:38, Tristan Le Guern wrote:
> Hi,
>
> The new SSH key format, ed25519, is not present in /etc/X11/xdm/Xsession.
>
> --- Xsession.cpp.orig Tue Feb 25 09:33:26 2014
> +++ Xsession.cpp Tue Feb 25 09:33:50 2014
> @@ -44,6 +44,7 @@ id1=$HOME/.ssh/identity
> id2=$HOME/.ssh/id_dsa
> id3=$HOME/.ssh/id_rsa
> id4=$HOME/.ssh/id_ecdsa
> +id5=$HOME/.ssh/id_ed25519
> if [ -z "$SSH_AGENT_PID" ];
> then
>
It needs to be added to the check as well, that's just a variable
definition. I think it's low-impact though, it would be fairly unusual
to have id_ed25519 without at least one of the other files, so I
don't see much harm in waiting until after we've tagged 5.5 if that's
preferred.
Index: Xsession.cpp
===================================================================
RCS file: /cvs/xenocara/app/xdm/config/Xsession.cpp,v
retrieving revision 1.12
diff -u -p -r1.12 Xsession.cpp
--- Xsession.cpp 19 May 2013 07:22:53 -0000 1.12
+++ Xsession.cpp 25 Feb 2014 09:36:48 -0000
@@ -44,9 +44,10 @@ id1=$HOME/.ssh/identity
id2=$HOME/.ssh/id_dsa
id3=$HOME/.ssh/id_rsa
id4=$HOME/.ssh/id_ecdsa
+id5=$HOME/.ssh/id_ed25519
if [ -z "$SSH_AGENT_PID" ];
then
- if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f
$id4 ];
+ if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f
$id4 -o -f $id5 ];
then
eval `ssh-agent -s`
ssh-add < /dev/null
