diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2021-01-14 15:20:55 -0500 |
|---|---|---|
| committer | Daniel Watkins <oddbloke@ubuntu.com> | 2021-01-15 10:53:27 -0500 |
| commit | 6fc9da9930485f4aa42aca6f2f7aa6f520223ec2 (patch) | |
| tree | 548781314a11ad0ed1f41442644f679c65adf5e8 /cloudinit | |
| parent | 47f4229ebcef9f83df8b549bb869a2dbf6dff17c (diff) | |
| download | vyos-cloud-init-6fc9da9930485f4aa42aca6f2f7aa6f520223ec2.tar.gz vyos-cloud-init-6fc9da9930485f4aa42aca6f2f7aa6f520223ec2.zip | |
Revert "ssh_util: handle non-default AuthorizedKeysFile config (#586)"
This reverts commit b0e73814db4027dba0b7dc0282e295b7f653325c.
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/ssh_util.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py index d5113996..c08042d6 100644 --- a/cloudinit/ssh_util.py +++ b/cloudinit/ssh_util.py @@ -262,13 +262,13 @@ def extract_authorized_keys(username, sshd_cfg_file=DEF_SSHD_CFG): except (IOError, OSError): # Give up and use a default key filename - auth_key_fns.append(default_authorizedkeys_file) + auth_key_fns[0] = default_authorizedkeys_file util.logexc(LOG, "Failed extracting 'AuthorizedKeysFile' in SSH " "config from %r, using 'AuthorizedKeysFile' file " "%r instead", DEF_SSHD_CFG, auth_key_fns[0]) - # always store all the keys in the first file configured on sshd_config - return (auth_key_fns[0], parse_authorized_keys(auth_key_fns)) + # always store all the keys in the user's private file + return (default_authorizedkeys_file, parse_authorized_keys(auth_key_fns)) def setup_user_keys(keys, username, options=None): |