Coding style and NEWS updates for check_afs_quotas fix

diff --git a/NEWS b/NEWS
index 81aad3851673270d74f3e41e28186b9b820d9ea0..aedab0b770aa603625c0b7ccfcaaa3c986b7bf35 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,10 @@
                      User-Visible afs-monitor Changes
 
+afs-monitor 2.3 (unreleased)
+
+    Fix bug in check_afs_quotas when checking all volumes on a partition
+    that has read-only or backup volumes.
+
 afs-monitor 2.2 (2011-03-03)
 
     Add a -d flag to check_afs_space that prints out Nagios performance

diff --git a/check_afs_quotas b/check_afs_quotas
index 89255f05c0eb6c350d1a0528b32380042b869d22..cb29d6f98bbac1ce71ca05845f3f9b849d03eab1 100755 (executable)
--- a/check_afs_quotas
+++ b/check_afs_quotas
@@ -11,7 +11,7 @@ our $VERSION = '@VERSION@ @DATE@';
 #
 # Written by Russ Allbery <rra@stanford.edu>
 # Based on a script by Steve Rader
-# Copyright 2010
+# Copyright 2010, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # This program is free software; you may redistribute it and/or modify it
@@ -103,9 +103,9 @@ sub serverinfo {
     my ($volume, %results);
     local $_;
     while (<LVOL>) {
-        if (/^(\S+)\s+\d+ (RW|RO|BK)\s+(\d+) K\s+On-line\s*$/) {
+        if (/^(\S+)\s+\d+ (?:RW|RO|BK)\s+(\d+) K\s+On-line\s*$/) {
             $volume = $1;
-            $results{$volume}{size} = $3;
+            $results{$volume}{size} = $2;
         } elsif (/^\s+MaxQuota\s+(\d+) K\s*$/) {
             $results{$volume}{quota} = $1 if defined $volume;
         }