From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 19 May 2008 14:00:56 +0000 (+0000)
Subject: [project @ peter@palfrader.org-20080519140056-erh6cz668orr096h]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=3b1d57580fdf016809a35b1f98d95a65bc875a69;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080519140056-erh6cz668orr096h]
weak-ssh-keys-check: Ignore empty lines in authorized-keys files.
---

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 8f21cff..c5c427d 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,9 @@
+dsa-nagios-nrpe-config (42) unstable; urgency=low
+
+  * weak-ssh-keys-check: Ignore empty lines in authorized-keys files.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 19 May 2008 14:00:28 +0000
+
 dsa-nagios-nrpe-config (41) unstable; urgency=low
 
   * Add dsa-check-statusfile.
diff --git a/dsa-nagios-nrpe-config/weak-ssh-keys-check b/dsa-nagios-nrpe-config/weak-ssh-keys-check
index 3e07842..a1a5294 100755
--- a/dsa-nagios-nrpe-config/weak-ssh-keys-check
+++ b/dsa-nagios-nrpe-config/weak-ssh-keys-check
@@ -227,6 +227,7 @@ sub from_ssh_auth_file ($) {
 	chomp $line;
 	my $lineno = $.;
 	clear_tmp $tmp;
+	next if $line =~ m/^$/; # ignore empty lines
 	next if $line =~ m/^#/; # ignore comments
 	if ($line =~ m/^ssh-dss/) {
 		$dsa_keys++;