diff options
| author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:42:53 +0000 |
| commit | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (patch) | |
| tree | 9f4b96055e6ccaa915e8d59d9f2805e9e119371d /contrib/ssh-copy-id | |
| parent | a25ec0b132c44c9e341e08464ff830de06b81126 (diff) | |
| parent | ef94e5613d37bcbf880f21ee6094e4b1c7683a4c (diff) | |
import openssh-5.1p1-gsskex-cjwatson-20080722.patch
Diffstat (limited to 'contrib/ssh-copy-id')
| -rw-r--r-- | contrib/ssh-copy-id | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 1555b5d37..acd36d398 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id | |||
| @@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then | |||
| 11 | shift | 11 | shift |
| 12 | # check if we have 2 parameters left, if so the first is the new ID file | 12 | # check if we have 2 parameters left, if so the first is the new ID file |
| 13 | if [ -n "$2" ]; then | 13 | if [ -n "$2" ]; then |
| 14 | if expr "$1" : ".*\.pub" ; then | 14 | if expr "$1" : ".*\.pub" > /dev/null ; then |
| 15 | ID_FILE="$1" | 15 | ID_FILE="$1" |
| 16 | else | 16 | else |
| 17 | ID_FILE="$1.pub" | 17 | ID_FILE="$1.pub" |