Attachment 2527 Details for Bug 2331 – BUGFIX patch

[patch] BUGFIX patch

ssh-copy-id_ignore_configuration_file_bz2331.patch (text/plain), 1.12 KB, created by Elias Toivanen on 2015-01-13 05:11:31 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Elias Toivanen

Created: 2015-01-13 05:11:31 AEDT

Size: 1.12 KB

patch

obsolete

>diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
>index ae88e99..3e4e5c9 100644
>--- a/contrib/ssh-copy-id
>+++ b/contrib/ssh-copy-id
>@@ -210,11 +210,13 @@ populate_new_ids() {
>       while read ID ; do
>         printf '%s\n' "$ID" > $L_TMP_ID_FILE
> 
>-        # the next line assumes $PRIV_ID_FILE only set if using a single id file - this
>+        # Check if we can log in to the remote machine, preferring the private id 
>+        # file and ignoring all id files specified in configuration files.
>+        # It is assumed that $PRIV_ID_FILE is only set if using a single id file - this
>         # assumption will break if we implement the possibility of multiple -i options.
>         # The point being that if file based, ssh needs the private key, which it cannot
>         # find if only given the contents of the .pub file in an unrelated tmpfile
>-        ssh -i "${PRIV_ID_FILE:-$L_TMP_ID_FILE}" \
>+        ssh -F /dev/null -i "${PRIV_ID_FILE:-$L_TMP_ID_FILE}" \
>             -o PreferredAuthentications=publickey \
>             -o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null
>         if [ "$?" = "$L_SUCCESS" ] ; then

Actions: View | Diff

Attachments on bug 2331: 2527