RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-03 08:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,891 Commits 69 Branches 157 Tags 27 MiB
db97d8d0b9
Commit Graph

31 Commits

Author SHA1 Message Date
Philip Hands
476ac8e9d3 tidy the $INSTALLKEY_SH code layout a little 
SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983
 2021-02-26 01:06:15 +11:00
Jakub Jelen
983e05ef3b if unable to add a missing newline, fail 
SSH-Copy-ID-Upstream: 76b25e18f55499ea9edb4c4d6dc4a80bebc36d95
 2021-02-26 01:06:15 +11:00
Philip Hands
3594b3b015 use $AUTH_KEY_DIR, now that we have it 
since that was a change made since jjelen's commit was written

also, quote the variables

SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616
 2021-02-26 01:06:15 +11:00
Jakub Jelen
333e25f7bc restorecon the correct directory 
if using different path for authorized_keys file

SSH-Copy-ID-Upstream: 791a3df47b48412c726bff6f7b1d190721e65d51
 2021-02-26 01:06:15 +11:00
Philip Hands
e545d94b71 shift contents of long $() into filter_ids() 
This was prompted by the fact that posh does not deal with $()
that contains comments where the comment includes an odd number
of single-quotes. It seems to get befuddled into trying to find
the matching quote.
Regardless, making a function for filtering the unneeded ids
seems much neater than avoiding apostrophes,
so that's what I've done.

SSH-Copy-ID-Upstream: 3dab3366a584427045c8a690a93282f02c09cf24
 2020-10-13 12:45:05 +11:00
Philip Hands
fd36017459 combine if/elif to avoid duplication of the action 
SSH-Copy-ID-Upstream: 42aeb1cc53d3f7f6e78edc210fb121fda0834914
 2020-10-13 12:45:05 +11:00
Philip Hands
f7c3a39b01 shellcheck tidyage 
SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd
 2020-10-13 12:45:05 +11:00
Philip Hands
108676c3f2 tidy up test of $SCRATCH_DIR creation 
SSH-Copy-ID-Upstream: 2d8b22d96c105d87743ffe8874887b06f8989b93
 2020-10-13 12:44:38 +11:00
Philip Hands
a9c9e91a82 add -s flag: to install keys via SFTP 
This is prompted by:

 https://bugzilla.mindrot.org/show_bug.cgi?id=3201

Thanks go to Matthias Blümel for the idea, and the helpful patch, from
which this patch grew.

SSH-Copy-ID-Upstream: f7c76dc64427cd20287a6868f672423b62057614
 2020-10-13 11:52:47 +11:00
Philip Hands
ce941c75ea un-nest $() to make ksh cheerful 2020-10-03 09:26:00 +10:00
Philip Hands
18ea5f4b88 ksh doesn't grok 'local' 
and AFAICT it's not actually doing anything useful in the code, so let's
see how things go without it.
 2020-10-03 09:25:32 +10:00
Oleg
d9e727dcc0 Fix EOF: command not found error in ssh-copy-id 2020-10-03 09:20:55 +10:00
Damien Miller
9bb8a303ce sync with upstream ssh-copy-id rev f0da1a1b7 2020-09-22 10:07:43 +10:00
Damien Miller
35ff70a04d sync contrib/ssh-copy-id with upstream 2017-10-01 10:01:25 +11:00
Darren Tucker
8ff20ec95f Quote variables that may contain whitespace. 
The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to
survive paths containing whitespace.  bz#2551, from Corinna Vinschen via
Philip Hands.
 2016-03-14 09:24:03 +11:00
Damien Miller
ef39e8c049 sync ssh-copy-id with upstream 783ef08b0a75 2016-02-16 10:34:39 +11:00
Darren Tucker
b4e00949f0 - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test. 
Patch from cjwatson at debian.
 2013-06-05 22:48:44 +10:00
Damien Miller
6aa3eacc5e - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 
executed if mktemp failed; bz#2105 ok dtucker@
 2013-05-16 11:10:17 +10:00
Damien Miller
83efe7c861 - (djm) [contrib/ssh-copy-id contrib/ssh-copy-id.1] Updated to Phil 
Hands' greatly revised version.
 2013-03-22 10:17:36 +11:00
Damien Miller
44a6c9340a - (djm) [contrib/ssh-copy-id] Missing backlslash; spotted by 
bisson AT archlinux.org
 2011-08-17 12:01:44 +10:00
Damien Miller
d1eb1dd5ed - (djm) [contrib/ssh-copy-id] Fix failure for cases where the path to the 
identify file contained whitespace. bz#1828 patch from gwenael.lambrouin
   AT gmail.com; ok dtucker@
 2011-08-12 11:22:47 +10:00
Darren Tucker
02c47341a2 - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id. 
based in part on a patch from Colin Watson, ok djm@
 2010-08-10 13:36:09 +10:00
Damien Miller
ea909791c5 - (djm) [contrib/ssh-copy-id] Update key file explicitly under ~ 
rather than assuming that $CWD == $HOME. bz#1500, patch from
   timothy AT gelter.com
 2010-06-18 11:09:24 +10:00
Damien Miller
df08341060 - (djm) [contrib/ssh-copy-id] Don't blow up when the agent has no keys; 
bz#1723 patch from Adeodato Simó via Colin Watson; ok dtucker@
 2010-03-26 11:18:27 +11:00
Damien Miller
0266677f0f - (djm) [contrib/ssh-copy-id.1 contrib/ssh-copy-id] bz#1492: Make 
ssh-copy-id copy id_rsa.pub by default (instead of the legacy "identity"
   key). Patch from cjwatson AT debian.org
 2009-01-21 20:29:20 +11:00
Damien Miller
e27220eb5b - (djm) Silence noice from expr in ssh-copy-id; patch from 
mikel AT mikelward.com
 2008-01-20 05:52:04 +11:00
Darren Tucker
25a1234ef7 - (dtucker) [Makefile.in contrib/ssh-copy-id] Bug #894: Improve portability 
of shell constructs.  Patch from cjwatson at debian.org.
 2004-08-30 21:33:02 +10:00
Darren Tucker
e918318f2b - (dtucker) [contrib/ssh-copy-id] Bug #781: exit if ssh fails. Patch from 
cjwatson at debian.org.
 2004-01-05 08:16:34 +11:00
Damien Miller
8aff5cbed7 - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from 
cjwatson@debian.org
 2003-01-03 14:34:06 +11:00
Ben Lindstrom
f16c81f900 - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys. 
Prompted by Matthew Vernon <matthew@sel.cam.ac.uk>
 2001-10-08 01:54:24 +00:00
Damien Miller
8b1c22b775 - Created contrib/ subdirectory. Included helpers from Phil Hands' 
Debian package, README file and chroot patch from Ricardo Cerqueira
   <rmcc@clix.pt>
 - Moved gnome-ssh-askpass.c to contrib directory and reomved config
   option.
 - Slight cleanup to doc files
 2000-03-15 12:13:01 +11:00