forked from pool/openssh
7bccbbd821
- Update to 7.8p1:
* no actual changes for the askpass
- Format with spec-cleaner
- Respect cflags
- Use gtk3 rather than gtk2 which is being phased out
- Remove the mention of the SLE12 in the README.SUSE
- Install firewall rules only when really needed (<SLE15)
- Version update to 7.8p1:
* For most details see release notes file
* ssh-keygen(1): write OpenSSH format private keys by default
instead of using OpenSSL's PEM format
- Rebase patches to apply on 7.8p1 release:
* openssh-7.7p1-fips.patch
* openssh-7.7p1-cavstest-kdf.patch
* openssh-7.7p1-fips_checks.patch
* openssh-7.7p1-gssapi_key_exchange.patch
* openssh-7.7p1-audit.patch
* openssh-7.7p1-openssl_1.1.0.patch
* openssh-7.7p1-ldap.patch
* openssh-7.7p1-IPv6_X_forwarding.patch
* openssh-7.7p1-sftp_print_diagnostic_messages.patch
* openssh-7.7p1-disable_short_DH_parameters.patch
* openssh-7.7p1-hostname_changes_when_forwarding_X.patch
* openssh-7.7p1-pam_check_locks.patch
* openssh-7.7p1-seed-prng.patch
* openssh-7.7p1-systemd-notify.patch
* openssh-7.7p1-X11_trusted_forwarding.patch
- Dropped patches:
OBS-URL: https://build.opensuse.org/request/show/642573
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=153
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
# HG changeset patch
|
|
# Parent 0f731d0b541b8a919d24ac91098f560a49712822
|
|
Suggest command line for removal of offending keys from known_hosts file
|
|
|
|
diff --git a/openssh-7.7p1/sshconnect.c b/openssh-7.7p1/sshconnect.c
|
|
--- openssh-7.7p1/sshconnect.c
|
|
+++ openssh-7.7p1/sshconnect.c
|
|
@@ -1147,16 +1147,21 @@ check_host_key(char *hostname, struct so
|
|
}
|
|
/* The host key has changed. */
|
|
warn_changed_key(host_key);
|
|
error("Add correct host key in %.100s to get rid of this message.",
|
|
user_hostfiles[0]);
|
|
error("Offending %s key in %s:%lu",
|
|
sshkey_type(host_found->key),
|
|
host_found->file, host_found->line);
|
|
+ error("You can use following command to remove the offending key:");
|
|
+ if (host_found->file)
|
|
+ error("ssh-keygen -R %s -f %s", host, host_found->file);
|
|
+ else
|
|
+ error("ssh-keygen -R %s", host);
|
|
|
|
/*
|
|
* If strict host key checking is in use, the user will have
|
|
* to edit the key manually and we can only abort.
|
|
*/
|
|
if (options.strict_host_key_checking !=
|
|
SSH_STRICT_HOSTKEY_OFF) {
|
|
error("%s host key for %.200s has changed and you have "
|