summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Weiß <holger@zedat.fu-berlin.de>2011-11-02 12:45:21 +0100
committerHolger Weiß <holger@zedat.fu-berlin.de>2011-11-02 12:45:21 +0100
commite08f9951f53d5acf35389e6d9975f976fc1f7c99 (patch)
tree9ac92917065a0866809cc3b6a5b24b4debd26879 /src
parentb3c75de812d23b61afcfaaad3988fbde8fecddb7 (diff)
downloadbcfg2-e08f9951f53d5acf35389e6d9975f976fc1f7c99.tar.gz
bcfg2-e08f9951f53d5acf35389e6d9975f976fc1f7c99.tar.bz2
bcfg2-e08f9951f53d5acf35389e6d9975f976fc1f7c99.zip
SSHbase: Sort ssh_known_host entries by hostname
Sort the (non-static) public keys in the auto-generated ssh_known_hosts files by hostname (or group).
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugins/SSHbase.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py
index d9adfdb61..8cc7f956c 100644
--- a/src/lib/Server/Plugins/SSHbase.py
+++ b/src/lib/Server/Plugins/SSHbase.py
@@ -179,7 +179,8 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin,
if pubk.endswith('.pub')]
pubkeys.sort()
for pubkey in pubkeys:
- for entry in self.entries[pubkey].entries.values():
+ for entry in sorted(self.entries[pubkey].entries.values(),
+ key=lambda e: e.specific.hostname or e.specific.group):
specific = entry.specific
hostnames = []
if specific.hostname and specific.hostname in names: