Bug#991797: openssh-client: UserKnownHostsFile default wrong

Package: openssh-client
Version: 1:8.4p1-5
Severity: important

Dear Maintainer,

The default setting of UserKnownHostsFile has changed in this version to:

~/.ssh/known_hosts.d/%k

But existing former versions have placed it in:

~/.ssh/known_hosts

This renders ssh connections impossible, unless I change it back to the 
former default by adding to ssh_config:

UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2

Regards,

FMF

-- System Information:
Debian Release: 11.0
   APT prefers testing
   APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 5.10.0-8-amd64 (SMP w/2 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages openssh-client depends on:
ii  adduser           3.118
ii  dpkg              1.20.9
ii  libc6             2.31-13
ii  libedit2          3.1-20191231-2+b1
ii  libfido2-1        1.6.0-2
ii  libgssapi-krb5-2  1.18.3-6
ii  libselinux1       3.1-3
ii  libssl1.1         1.1.1k-1
ii  passwd            1:4.8.1-1
ii  zlib1g            1:1.2.11.dfsg-2

Versions of packages openssh-client recommends:
ii  xauth  1:1.1-1

Versions of packages openssh-client suggests:
pn  keychain      <none>
pn  libpam-ssh    <none>
pn  monkeysphere  <none>
pn  ssh-askpass   <none>

-- Configuration Files:
/etc/ssh/ssh_config changed:
Include /etc/ssh/ssh_config.d/*.conf
Host *
UserKnownHostsFile ~/.ssh/known_hosts ~/.ssh/known_hosts2
     SendEnv LANG LC_*
     HashKnownHosts yes
     GSSAPIAuthentication yes


-- no debconf information