tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Silence noice from expr in ssh-copy-id; patch from 

mikel AT mikelward.com
This commit is contained in:
Damien Miller 2008-01-20 05:52:04 +11:00
parent d4827ab50c
commit e27220eb5b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20080119
- (djm) Silence noice from expr in ssh-copy-id; patch from
mikel AT mikelward.com
20080102 20080102
- (dtucker) [configure.ac] Fix message for -fstack-protector-all test. - (dtucker) [configure.ac] Fix message for -fstack-protector-all test.
@ -3519,4 +3523,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4817 2008/01/02 07:08:45 dtucker Exp $ $Id: ChangeLog,v 1.4818 2008/01/19 18:52:04 djm Exp $

2
contrib/ssh-copy-id
View File

@ -11,7 +11,7 @@ if [ "-i" = "$1" ]; then
shift shift
# check if we have 2 parameters left, if so the first is the new ID file # check if we have 2 parameters left, if so the first is the new ID file
if [ -n "$2" ]; then if [ -n "$2" ]; then
if expr "$1" : ".*\.pub" ; then if expr "$1" : ".*\.pub" > /dev/null ; then
ID_FILE="$1" ID_FILE="$1"
else else
ID_FILE="$1.pub" ID_FILE="$1.pub"