Permalink
Browse files

puppet wants to send in keys with comment lines

  • Loading branch information...
1 parent b4f96e0 commit 5858ecb56e3ad3e8ae9fe30edc51ccaa0de83a86 @sitaramc committed Nov 8, 2011
Showing with 2 additions and 1 deletion.
  1. +1 −0 src/gitolite.pm
  2. +1 −1 src/sshkeys-lint
View
@@ -1077,6 +1077,7 @@ sub setup_authkeys
local $/ = undef;
local @ARGV = ($pubkey);
$pubkey_content = <>;
+ $pubkey_content =~ s/^\s*#.*\n//gm;
}
$pubkey_content =~ s/\s*$/\n/;
# don't trust files with multiple lines (i.e., something after a newline)
View
@@ -38,7 +38,7 @@ print "\n";
my @pubkeys = sort glob("*.pub");
die "no *.pub files here\n" unless @pubkeys;
for my $pub (@pubkeys) {
- my @lines = filelines($pub);
+ my @lines = grep { ! /^\s*#/ } filelines($pub);
die "$pub has more than one line\n" if @lines > 1;
die "$pub does not start with ssh-rsa or ssh-dss\n" unless $lines[0] =~ /^(?:ssh-rsa|ssh-dss) (\S+)/;
my $key = $1;

0 comments on commit 5858ecb

Please sign in to comment.