summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFrancois Deppierraz <francois@ctrlaltdel.ch>2008-09-27 18:44:13 +0200
committerJames Turnbull <james@lovedthanlost.net>2008-10-07 00:24:02 +1100
commit990e8e3caadf488b5dd1d6b3bcb30df492f99647 (patch)
tree446e4ce828466a74d054660ffa87ea9cf89cd99a /lib
parent06edac4a23b7d0c27e471c837fa34432dbc5f806 (diff)
downloadpuppet-990e8e3caadf488b5dd1d6b3bcb30df492f99647.tar.gz
puppet-990e8e3caadf488b5dd1d6b3bcb30df492f99647.tar.xz
puppet-990e8e3caadf488b5dd1d6b3bcb30df492f99647.zip
Fix #1530: Correctly parse ssh type 1 keys
This doesn't implies that puppet can managed SSH type 1 keys, it only ignores them.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/provider/ssh_authorized_key/parsed.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/puppet/provider/ssh_authorized_key/parsed.rb b/lib/puppet/provider/ssh_authorized_key/parsed.rb
index 602e6dd1b..5411a1fb8 100644
--- a/lib/puppet/provider/ssh_authorized_key/parsed.rb
+++ b/lib/puppet/provider/ssh_authorized_key/parsed.rb
@@ -30,6 +30,12 @@ Puppet::Type.type(:ssh_authorized_key).provide(:parsed,
end
}
+ record_line :key_v1,
+ :fields => %w{options bits exponent modulus name},
+ :optional => %w{options},
+ :rts => /^\s+/,
+ :match => /^(?:(.+) )?(\d+) (\d+) (\d+)(?: (.+))?$/
+
def prefetch
# This was done in the type class but path expansion was failing for
# not yet existing users, the only workaround I found was to move that