From 582f0fc6ac76b1f6befc89c0352ae8923b1592d7 Mon Sep 17 00:00:00 2001
From: hjp <hjp>
Date: Mon, 12 Dec 2005 08:48:59 +0000
Subject: [PATCH] Allow non-word characters in usernames (machine accounts end
 with $)

---
 quotacheck/quotasanitycheck.pl | 9 ++++++---
 quotacheck/quotastat.pl        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/quotacheck/quotasanitycheck.pl b/quotacheck/quotasanitycheck.pl
index 254c1c1..b7869c4 100644
--- a/quotacheck/quotasanitycheck.pl
+++ b/quotacheck/quotasanitycheck.pl
@@ -1,8 +1,11 @@
 #!@@@perl@@@
 #
-# $Id: quotasanitycheck.pl,v 1.1 1998-09-17 08:32:57 hjp Exp $
+# $Id: quotasanitycheck.pl,v 1.2 2005-12-12 08:48:59 hjp Exp $
 # $Log: quotasanitycheck.pl,v $
-# Revision 1.1  1998-09-17 08:32:57  hjp
+# Revision 1.2  2005-12-12 08:48:59  hjp
+# Allow non-word characters in usernames (machine accounts end with $)
+#
+# Revision 1.1  1998/09/17 08:32:57  hjp
 # CVS cleanups:
 # 	Added quotasanitycheck.pl and removed quotasanitycheck.
 # 	Added quotasanitycheck
@@ -45,7 +48,7 @@ for $ln (@df) {
     if ($fs =~ m|^/dev/|) {
 	open REPQUOTA, "@@@repquota@@@ $mount 2>/dev/null |" or die "cannot call @@@repquota@@@: $!";
 	while (<REPQUOTA>) {
-	    if  (/(\w+) \s+ [-+][-+] \s*
+	    if  (/(\S+) \s+ [-+][-+] \s*
 	         (\d+)\s+(\d+)\s+(\d+)\s+(NOT\sSTARTED|EXPIRED|\d+\.\d+\ (?:days|hours)|)\s+
 	         (\d+)\s+(\d+)\s+(\d+)\s+(NOT\sSTARTED|EXPIRED|\d+\.\d+\ (?:days|hours)|)
 		 /x) {
diff --git a/quotacheck/quotastat.pl b/quotacheck/quotastat.pl
index 5a02bca..f7e09cd 100644
--- a/quotacheck/quotastat.pl
+++ b/quotacheck/quotastat.pl
@@ -34,7 +34,7 @@ for $ln (@df) {
 	    $msg = "";
 	    if (!/\b\d+\b/) {
 		#print "header: $_";
-	    } elsif  (/(\w+) \s+ [-+][-+] \s*
+	    } elsif  (/(\S+) \s+ [-+][-+] \s*
 	         (\d+)\s+(\d+)\s+(\d+)\s+(|$hpuxtime|$linuxtime)\s+
 	         (\d+)\s+(\d+)\s+(\d+)\s+(|$hpuxtime|$linuxtime)
 		 /x) {