X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-udldap-freshness;h=9d85424274e0064b5586dadb7b5ba52a9d4ca74e;hb=68139555d92723c03cf46cdbc802dccf9c0115ee;hp=e67abafb3fd5ef6ff9516da99f197d70f890787e;hpb=f1d8d19cdfd02c4bc6e26f8572b8f1194083c941;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-udldap-freshness b/dsa-nagios-checks/checks/dsa-check-udldap-freshness
index e67abaf..9d85424 100755
--- a/dsa-nagios-checks/checks/dsa-check-udldap-freshness
+++ b/dsa-nagios-checks/checks/dsa-check-udldap-freshness
@@ -9,6 +9,8 @@ my %CODE = (
 	'UNKNOWN'       => 3
 );
 
+my $f;
+
 $SIG{__DIE__ } = sub() {
 	print shift;
 	exit $CODE{'UNKNOWN'};
@@ -34,18 +36,29 @@ sub check_age {
 };
 
 my @msg;
-my $f = "/var/lib/misc/thishost/last_update.trace";
-unless (-e $f) {
-	print "WARNING: $f does not exist.\n";
-	exit $CODE{'WARNING'};
-};
+my @to_check = ();
+
+if (-f '/var/lib/misc/thishost/last_update.trace') {
+	# New style check
+	push @to_check, '/var/lib/misc/thishost/last_update.trace';
+} else {
+	# Old style
+	push @to_check, qw{/var/lib/misc/thishost/passwd.tdb /var/lib/misc/passwd.db};
+}
 
-my $a = check_age($f);
-if ($a->[0] != 0) {
-	print $a->[1], "\n";
-	exit $a->[0];
+for $f (@to_check) {
+	unless (-e $f) {
+		print "WARNING: $f does not exist.\n";
+		exit $CODE{'WARNING'};
+	};
+
+	my $a = check_age($f);
+	if ($a->[0] != 0) {
+		print $a->[1], "\n";
+		exit $a->[0];
+	};
+	push @msg, $a->[1];
 };
-push @msg, $a->[1];
 
 print "OK: ", join(', ', @msg), "\n";
 exit 0;