summaryrefslogtreecommitdiff
path: root/app/xdm/config
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-03-19 15:40:03 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-03-19 15:40:03 +0000
commit1d7c814fce3ebe98ce9ad85d945faa16bd1e589b (patch)
treea9950a4d52d9eb270584cc6fed1117f70dc0dfb8 /app/xdm/config
parentc72524ef8f310e5a9a3444faa0c879cd5bb256a6 (diff)
Add support for ecdsa SSH keys. From dave at davec dot name. Thanks.
Diffstat (limited to 'app/xdm/config')
-rw-r--r--app/xdm/config/Xsession.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp
index 4079917cf..b100a23be 100644
--- a/app/xdm/config/Xsession.cpp
+++ b/app/xdm/config/Xsession.cpp
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XCOMM $OpenBSD: Xsession.cpp,v 1.6 2010/03/28 09:33:02 matthieu Exp $
+XCOMM $OpenBSD: Xsession.cpp,v 1.7 2011/03/19 15:40:02 matthieu Exp $
XCOMM redirect errors to a file in user's home directory if we can
for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
@@ -21,7 +21,8 @@ XCOMM if we have private ssh key(s), start ssh-agent and add the key(s)
id1=$HOME/.ssh/identity
id2=$HOME/.ssh/id_dsa
id3=$HOME/.ssh/id_rsa
-if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 ];
+id4=$HOME/.ssh/id_ecdsa
+if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ];
then
eval `ssh-agent -s`
ssh-add < /dev/null