Commit Graph

416 Commits

Author SHA1 Message Date
Damien Miller 57ed647ee0 polish whitespace for portable files 2021-04-03 17:47:37 +11:00
Damien Miller 71241fc05d gnome-ssh-askpass3 is a valid target here 2021-03-29 15:14:25 +11:00
Damien Miller 67a8bb7fe6 update RPM spec version numbers 2021-03-02 21:29:54 +11:00
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 279261e1ea update version numbers 2020-09-27 17:25:01 +10:00
Damien Miller 9bb8a303ce sync with upstream ssh-copy-id rev f0da1a1b7 2020-09-22 10:07:43 +10:00
Damien Miller f93b187ab9 control over the colours in gnome-ssh-askpass[23]
Optionally set the textarea colours via $GNOME_SSH_ASKPASS_FG_COLOR and
$GNOME_SSH_ASKPASS_BG_COLOR. These accept the usual three or six digit
hex colours.
2020-09-18 14:55:48 +10:00
Damien Miller 9d3d36bdb1 focus improvement for gnome-ssh-askpass[23]
When serving a SSH_ASKPASS_PROMPT=none information dialog, ensure
then <enter> doesn't immediately close the dialog. Instead, require an
explicit <tab> to reach the close button, or <esc>.
2020-09-18 14:50:38 +10:00
Damien Miller 3ec9a6d731 Add ssh-sk-helper and manpage to RPM spec file
Based on patch from Fabio Pedretti
2020-07-20 13:09:25 +10:00
Damien Miller 58ad004acd prepare for 8.3 release 2020-05-12 12:58:46 +10:00
Damien Miller def31bc542 spelling mistakes
from https://fossies.org/linux/misc/openssh-8.2p1.tar.gz/codespell.html
2020-03-13 14:23:07 +11:00
Nico Kadel-Garcia b2491c289d Switch %define to %global for redhat/openssh.spec 2020-02-22 11:48:05 +11:00
Damien Miller 72f0ce33f0 crank version numbers 2020-02-12 09:28:35 +11:00
Darren Tucker 69e44ba701 Fix typo: 'you' -> 'your'.
bz#3108 from jmckitrick@gmail.com.
2020-01-06 09:02:53 +11:00
Damien Miller b497e920b4 Teach the GTK2/3 ssh-askpass the new prompt hints
ssh/ssh-agent now sets a hint environment variable $SSH_ASKPASS_PROMPT
when running the askpass program. This is intended to allow the
askpass to vary its UI across the three cases it supports: asking for
a passphrase, confirming the use of a key and (recently) reminding
a user to touch their security key.

This adapts the gnome-ssh-askpass[23] to use these hints. Specifically,
for SSH_ASKPASS_PROMPT=confirm it will skip the text input box and show
only "yes"/"no" buttons. For SSH_ASKPASS_PROMPT=none (used to remind
users to tap their security key), it shows only a "close" button.

Help wanted: adapt the other askpass programs in active use, including
x11-ssh-askpass, lxqt-openssh-askpass, etc.
2019-11-18 15:22:40 +11:00
Damien Miller cdf1d0a9f5 prepare for 8.1 release 2019-10-09 11:31:03 +11:00
Sorin Adrian Savu 2459df9aa1 openssl-devel is obsoleted by libssl-devel
openssl-devel is no longer installable via the cygwin setup and
it's hidden by default, so you can't see the replacement very easy.
2019-06-05 15:04:57 +10:00
Damien Miller a924de0c49 update versions 2019-04-05 03:41:52 +11:00
Darren Tucker 825ab32f0d On Cygwin run sshd as SYSTEM where possible.
Seteuid now creates user token using S4U.  We don't create a token
from scratch anymore, so we don't need the "Create a process token"
privilege.  The service can run under SYSTEM again...

...unless Cygwin is running on Windows Vista or Windows 7 in the
WOW64 32 bit emulation layer.  It turns out that WOW64 on these systems
didn't implement MsV1_0 S4U Logon so we still need the fallback
to NtCreateToken for these systems.

Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
2019-03-14 08:51:17 +11:00
Corinna Vinschen 1d05b4adcb Cygwin: only tweak sshd_config file if it's new, drop creating sshd user
The sshd_config tweaks were executed even if the old file was
still in place.  Fix that.  Also disable sshd user creation.
It's not used on Cygwin.
2019-01-28 09:57:58 +11:00
Corinna Vinschen 89843de0c4 Cygwin: Change service name to cygsshd
Microsoft hijacked the sshd service name without asking.
2019-01-28 09:57:58 +11:00
Darren Tucker f2970868f8 Improve warnings in cygwin service setup.
bz#2922, patch from vinschen at redhat.com.
2018-11-11 15:58:20 +11:00
Darren Tucker bd2d54fc1e Remove hardcoded service name in cygwin setup.
bz#2922, patch from Christian.Lupien at USherbrooke.ca, sanity check
by vinschen at redhat.com.
2018-11-11 15:54:54 +11:00
Damien Miller a7205e68de update version numbers ahead of release 2018-10-12 09:47:20 +11:00
Damien Miller c8313e4923 update version numbers in anticipation of release 2018-08-17 05:45:36 +10:00
Darren Tucker 7703ae5f5d Use ssh-keygen -A to generate missing host keys.
Instead of testing for each specific key type, use ssh-keygen -A to
generate any missing host key types.
2018-06-06 16:05:44 +10:00
Damien Miller 10479cc2a4 Many typo fixes from Karsten Weiss
Spotted using https://github.com/lucasdemarchi/codespell
2018-04-10 10:19:02 +10:00
Damien Miller a0349a1cc4 update versions in .spec files 2018-04-02 15:38:28 +10:00
Darren Tucker 265d88d4e6 Remove remaining now-obsolete cvs $Ids. 2018-02-15 20:06:19 +11:00
Darren Tucker cdb10bd431 Add changelog entry for binary strip change. 2018-02-10 11:18:38 +11:00
Darren Tucker 937d96587d Don't strip binaries so debuginfo gets built.
Tell install not to strip binaries during package creation so that the
debuginfo package can be built.
2018-02-10 11:12:45 +11:00
Darren Tucker eb0865f330 Fix bogus dates in changelog. 2018-02-10 10:33:11 +11:00
Darren Tucker 7fbde1b34c Remove SSH1 from description. 2018-02-10 10:25:15 +11:00
Darren Tucker 9c34a76f09 Add support for compat-openssl10 build dep. 2018-02-10 10:23:00 +11:00
Darren Tucker 04f4e8193c Add leading zero so it'll work when rhel not set.
When rhel is not set it will error out with "bad if". Add leading zero
as per https://fedoraproject.org/wiki/Packaging:DistTag so it'll work
on non-RHEL.
2018-02-10 09:58:32 +11:00
Darren Tucker 12abd67a6a Update openssl-devel dependency. 2018-02-10 09:58:32 +11:00
nkadel b33e7645f8 Add mandir with-mandir' for RHEL 5 compatibility.
Activate '--mandir' and '--with-mandir' settings in setup for RHEL
5 compatibility.
2018-02-10 09:58:32 +11:00
nkadel 94f8bf360e Discard 'K5DIR' reporting.
It does not work inside 'mock' build environment.
2018-02-10 09:58:32 +11:00
nkadel bb7e54dbaf Add 'dist' to 'rel' for OS specific RPM names. 2018-02-10 09:58:32 +11:00