Commit Graph

12 Commits

Author SHA1 Message Date
Simon J. Gerraty
3b8f084595 Merge head 2014-04-28 07:50:45 +00:00
Eitan Adler
0f4d097284 ssh-copy-id: add restorecon call
In certain situations when creating an authorized_key file on a Linux machine
restorecon(1) may need to be called.  Therefore, attempt to run it if it exists.

MFC After:	1 week
Idea from:	https://bugzilla.redhat.com/show_bug.cgi?id=739989
2014-03-01 03:36:46 +00:00
Eitan Adler
df54ea8001 ssh-copy-id: avoid sending private keys; add -v option
To help avoid confusion: when attempting to send a key file check to see if a
file of the same name exists with a '.pub' suffix and send that instead.  This
mimics the behavior of other ssh-copy-id scripts.

Add -v passthrough.

Reported by:	dweimer <dweimer@dweimer.net>
Reported by:	feld
MFC After:	1 week
2014-03-01 03:17:46 +00:00
Simon J. Gerraty
f5f7c05209 Updated dependencies 2013-02-16 01:23:54 +00:00
David E. O'Brien
d9a447559b Sync with HEAD. 2013-02-08 16:10:16 +00:00
Eitan Adler
843ab1e81f Add examples to the ssh-copy-id script.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-13 13:06:57 +00:00
Eitan Adler
a018185aeb Clarify where the authorized_key file lives.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-12 14:16:39 +00:00
Eitan Adler
a0f63581ce Add the standard exit status to the ssh-copy-id man page.
Approved by:	bcr (mentor)
MFC after:	3 days
2012-11-11 15:34:58 +00:00
Eitan Adler
076ea53ee5 Be a bit more paranoid.
Use more portable constructs in order to allow upstream adoption
Add per-file error messages

Reviewed by:	jilles
Approved by:	cperciva
MFC after:	1 week
2012-11-10 03:44:08 +00:00
Simon J. Gerraty
7cd2dcf076 Updated/new Makefile.depend 2012-11-08 21:24:17 +00:00
Eitan Adler
25c1da1567 Somehow this got replicated too many times
Approved by: cperciva (implicit)
2012-10-22 12:05:14 +00:00
Eitan Adler
2beb708522 Add a clean-room reimplementation of a script originally
found in openssh's contrib directory.

This version has more features and is better written.
I intend to submit this upstream as well.

Reviewed by:	bapt
Reviewed by:	des
Approved by:	cperciva
MFC after:	1 week
2012-10-22 03:57:00 +00:00