View | Details | Raw Unified | Return to bug 2105 | Differences between
and this patch

Collapse All | Expand All

(-)contrib/ssh-copy-id (-1 / +8 lines)
Lines 165-170 done Link Here
165
165
166
eval set -- "$SAVEARGS"
166
eval set -- "$SAVEARGS"
167
167
168
if [ $# == 0 ] ; then
169
  usage
170
fi
168
if [ $# != 1 ] ; then
171
if [ $# != 1 ] ; then
169
  printf '%s: ERROR: Too many arguments.  Expecting a target hostname, got: %s\n\n' "$0" "$SAVEARGS" >&2
172
  printf '%s: ERROR: Too many arguments.  Expecting a target hostname, got: %s\n\n' "$0" "$SAVEARGS" >&2
170
  usage
173
  usage
Lines 196-202 populate_new_ids() { Link Here
196
199
197
  umask 0177
200
  umask 0177
198
  local L_TMP_ID_FILE=$(mktemp ~/.ssh/ssh-copy-id_id.XXXXXXXXXX)
201
  local L_TMP_ID_FILE=$(mktemp ~/.ssh/ssh-copy-id_id.XXXXXXXXXX)
199
  trap "rm -f $L_TMP_ID_FILE*" EXIT TERM INT QUIT
202
  if test $? -ne 0 -o "x$L_TMP_ID_FILE" = "x" ; then
203
    echo "mktemp failed" 1>&2
204
    exit 1
205
  fi
206
  trap "rm -f $L_TMP_ID_FILE ${L_TMP_ID_FILE}.pub" EXIT TERM INT QUIT
200
  printf '%s: INFO: attempting to log in with the new key(s), to filter out any that are already installed\n' "$0" >&2
207
  printf '%s: INFO: attempting to log in with the new key(s), to filter out any that are already installed\n' "$0" >&2
201
  NEW_IDS=$(
208
  NEW_IDS=$(
202
    eval $GET_ID | {
209
    eval $GET_ID | {

Return to bug 2105