summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-10-27 16:07:27 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-10-27 16:07:27 -0400
commitdf99269a1ab9effe58f962e3263a99661cbdc744 (patch)
treeff17295e4feb950eea061daa8fa3727ad76cec27 /src
parentfff865e8f428f93c7718b9932552ea0261a95500 (diff)
downloadbcfg2-df99269a1ab9effe58f962e3263a99661cbdc744.tar.gz
bcfg2-df99269a1ab9effe58f962e3263a99661cbdc744.tar.bz2
bcfg2-df99269a1ab9effe58f962e3263a99661cbdc744.zip
fixed bug with inclusion of bogus ssh host keys in ssh_known_hosts
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugins/SSHbase.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py
index d31405a57..ea3d12d3e 100644
--- a/src/lib/Server/Plugins/SSHbase.py
+++ b/src/lib/Server/Plugins/SSHbase.py
@@ -178,6 +178,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
for pubkey in pubkeys:
for entry in self.entries[pubkey].entries.values():
specific = entry.specific
+ hostnames = []
if specific.hostname and specific.hostname in names:
hostnames = names[specific.hostname]
elif specific.group:
@@ -193,6 +194,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
if not hostnames:
self.logger.info("Unknown key %s, skipping" %
entry.name)
+ continue
skn.append("%s %s" % (','.join(hostnames),
entry.data.decode().rstrip()))