From c431144283b6a348c761636e552c74091f4367f1 Mon Sep 17 00:00:00 2001 From: harlowja Date: Wed, 20 Jun 2012 00:29:51 -0700 Subject: Ensure any authorized key file found in authorized keys is path adjusted as well --- cloudinit/ssh_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/ssh_util.py b/cloudinit/ssh_util.py index 96143d32..fef3d40f 100644 --- a/cloudinit/ssh_util.py +++ b/cloudinit/ssh_util.py @@ -244,7 +244,7 @@ def setup_user_keys(keys, user, key_prefix, paths): akeys = akeys.replace("%%", '%') if not akeys.startswith('/'): akeys = os.path.join(pwent.pw_dir, akeys) - authorized_keys = akeys + authorized_keys = paths.join(False, akeys) except (IOError, OSError): authorized_keys = os.path.join(ssh_dir, 'authorized_keys') util.logexc(LOG, ("Failed extracting 'AuthorizedKeysFile'" -- cgit v1.2.3