reyk/cloud-agent
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make the public key optional but print a warning

Browse source
This commit is contained in:
Reyk Floeter 2018-05-08 10:03:38 +02:00
parent 155d216845
commit f48b2bc2b9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/cloudinit.c
View file

@ -75,13 +75,13 @@ cloudinit_fetch(struct system_config *sc)
"/latest/meta-data/local-hostname", WORD)) == NULL)
goto fail;
/* pubkey */
/* optional pubkey */
if ((str = metadata(sc,
"/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL &&
(str = metadata(sc,
"/latest/meta-data/public-keys", LINE)) == NULL)
goto fail;
if (agent_addpubkey(sc, str, NULL) != 0)
log_warnx("failed to get public key");
else if (agent_addpubkey(sc, str, NULL) != 0)
goto fail;
/* optional username - this is an extension by meta-data(8) */