|
Lines 215-220
populate_new_ids() {
Link Here
|
| 215 |
# The point being that if file based, ssh needs the private key, which it cannot |
215 |
# The point being that if file based, ssh needs the private key, which it cannot |
| 216 |
# find if only given the contents of the .pub file in an unrelated tmpfile |
216 |
# find if only given the contents of the .pub file in an unrelated tmpfile |
| 217 |
ssh -i "${PRIV_ID_FILE:-$L_TMP_ID_FILE}" \ |
217 |
ssh -i "${PRIV_ID_FILE:-$L_TMP_ID_FILE}" \ |
|
|
218 |
-o ControlPath=none \ |
| 218 |
-o PreferredAuthentications=publickey \ |
219 |
-o PreferredAuthentications=publickey \ |
| 219 |
-o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null |
220 |
-o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null |
| 220 |
if [ "$?" = "$L_SUCCESS" ] ; then |
221 |
if [ "$?" = "$L_SUCCESS" ] ; then |
|
Lines 243-249
populate_new_ids() {
Link Here
|
| 243 |
printf '%s: INFO: %d key(s) remain to be installed -- if you are prompted now it is to install the new keys\n' "$0" "$(printf '%s\n' "$NEW_IDS" | wc -l)" >&2 |
244 |
printf '%s: INFO: %d key(s) remain to be installed -- if you are prompted now it is to install the new keys\n' "$0" "$(printf '%s\n' "$NEW_IDS" | wc -l)" >&2 |
| 244 |
} |
245 |
} |
| 245 |
|
246 |
|
| 246 |
REMOTE_VERSION=$(ssh -v -o PreferredAuthentications=',' "$@" 2>&1 | |
247 |
REMOTE_VERSION=$(ssh -v -o PreferredAuthentications=',' -o ControlPath=none "$@" 2>&1 | |
| 247 |
sed -ne 's/.*remote software version //p') |
248 |
sed -ne 's/.*remote software version //p') |
| 248 |
|
249 |
|
| 249 |
case "$REMOTE_VERSION" in |
250 |
case "$REMOTE_VERSION" in |
| 250 |
- |
|
|