summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/Makefile4
-rw-r--r--contrib/gnome-ssh-askpass2.c2
-rw-r--r--contrib/ssh-copy-id6
3 files changed, 7 insertions, 5 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 2cef46f6c..00e96e7b9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -7,9 +7,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
7 `gnome-config --libs gnome gnomeui` 7 `gnome-config --libs gnome gnomeui`
8 8
9gnome-ssh-askpass2: gnome-ssh-askpass2.c 9gnome-ssh-askpass2: gnome-ssh-askpass2.c
10 $(CC) `pkg-config --cflags gtk+-2.0` \ 10 $(CC) `pkg-config --cflags gtk+-2.0 x11` \
11 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ 11 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
12 `pkg-config --libs gtk+-2.0` 12 `pkg-config --libs gtk+-2.0 x11`
13 13
14clean: 14clean:
15 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass 15 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c
index 901176dbb..86d9f9d05 100644
--- a/contrib/gnome-ssh-askpass2.c
+++ b/contrib/gnome-ssh-askpass2.c
@@ -207,6 +207,8 @@ main(int argc, char **argv)
207 207
208 gtk_init(&argc, &argv); 208 gtk_init(&argc, &argv);
209 209
210 gtk_window_set_default_icon_from_file ("/usr/share/pixmaps/ssh-askpass-gnome.png", NULL);
211
210 if (argc > 1) { 212 if (argc > 1) {
211 message = g_strjoinv(" ", argv + 1); 213 message = g_strjoinv(" ", argv + 1);
212 } else { 214 } else {
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index df74d25c8..2f757de4b 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -19,7 +19,7 @@ if [ "-i" = "$1" ]; then
19 shift # and this should leave $1 as the target name 19 shift # and this should leave $1 as the target name
20 fi 20 fi
21else 21else
22 if [ x$SSH_AUTH_SOCK != x ] ; then 22 if [ x$SSH_AUTH_SOCK != x ] && ssh-add -L >/dev/null 2>&1; then
23 GET_ID="$GET_ID ssh-add -L" 23 GET_ID="$GET_ID ssh-add -L"
24 fi 24 fi
25fi 25fi
@@ -38,10 +38,10 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
38 exit 1 38 exit 1
39fi 39fi
40 40
41{ eval "$GET_ID" ; } | ssh $1 "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1 41{ eval "$GET_ID" ; } | ssh ${1%:} "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
42 42
43cat <<EOF 43cat <<EOF
44Now try logging into the machine, with "ssh '$1'", and check in: 44Now try logging into the machine, with "ssh '${1%:}'", and check in:
45 45
46 .ssh/authorized_keys 46 .ssh/authorized_keys
47 47