Re: Xsession and id_ed25519

On Tue, Feb 25, 2014 at 08:59:02AM -0700, Theo de Raadt wrote:
> Please get this solved and commited ASAP, or it will miss release.

Sorry I was busy with other stuff. So here is the full diff ok ?

Index: app/xdm/config/Xsession.cpp
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xdm/config/Xsession.cpp,v
retrieving revision 1.12
diff -u -r1.12 Xsession.cpp
--- app/xdm/config/Xsession.cpp	19 May 2013 07:22:53 -0000	1.12
+++ app/xdm/config/Xsession.cpp	25 Feb 2014 22:08:18 -0000
@@ -44,9 +44,10 @@
 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
Index: app/xinit/xinitrc.cpp
===================================================================
RCS file: /cvs/OpenBSD/xenocara/app/xinit/xinitrc.cpp,v
retrieving revision 1.10
diff -u -r1.10 xinitrc.cpp
--- app/xinit/xinitrc.cpp	19 May 2013 07:22:53 -0000	1.10
+++ app/xinit/xinitrc.cpp	25 Feb 2014 22:08:18 -0000
@@ -45,9 +45,11 @@
 id2=$HOME/.ssh/id_dsa
 id3=$HOME/.ssh/id_rsa
 id4=$HOME/.ssh/id_ecdsa
+id5=$HOME/.ssh/id_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

-- 
Matthieu Herrb