diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2022-07-01 20:42:07 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2022-07-01 20:42:07 +0000 |
| commit | 3f117c4114d8349c6fb662baee17ad257a95f36f (patch) | |
| tree | 37e5d178b2a1a4c40f779f78974d16a03003a7bc /app/xinit | |
| parent | 3285a1c20cf3d51879e2707a3bf71f95133f43d2 (diff) | |
X11 session startup: update list of ssh key files, tweak sh code
ok matthieu@
Diffstat (limited to 'app/xinit')
| -rw-r--r-- | app/xinit/xinitrc.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/app/xinit/xinitrc.cpp b/app/xinit/xinitrc.cpp index 4c9c3ae8a..7aca3c6aa 100644 --- a/app/xinit/xinitrc.cpp +++ b/app/xinit/xinitrc.cpp @@ -1,5 +1,5 @@ XCOMM!SHELL_CMD -XCOMM $OpenBSD: xinitrc.cpp,v 1.13 2015/10/17 08:25:11 matthieu Exp $ +XCOMM $OpenBSD: xinitrc.cpp,v 1.14 2022/07/01 20:42:06 naddy Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -41,19 +41,17 @@ if [ -f "$usermodmap" ]; then fi 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 -id4=$HOME/.ssh/id_ecdsa -id5=$HOME/.ssh/id_ed25519 -if [ -z "$SSH_AGENT_PID" ]; +if [ -z "$SSH_AGENT_PID" ] && [ -x /usr/bin/ssh-agent ] then - 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 - fi + for k in id_rsa id_ecdsa id_ecdsa_sk id_ed25519 id_ed25519_sk id_dsa + do + if [ -f "$HOME/.ssh/$k" ]; then + eval `ssh-agent -s` + ssh-add < /dev/null + break + fi + done fi XCOMM start some nice programs |