From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 8 Jun 2015 14:26:21 +0000 (-0400)
Subject: More. Fixes #1035
X-Git-Tag: release_3_0_9~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6f097c94d2e960ffcdefdffef5ac47e50dace4;p=thirdparty%2Ffreeradius-server.git

More. Fixes #1035
---

diff --git a/share/format.pl b/share/format.pl
index 1f3b6ef73d2..a0031d1b49f 100755
--- a/share/format.pl
+++ b/share/format.pl
@@ -91,7 +91,7 @@ while (@ARGV) {
 	#
 	#  Remember if we did begin-vendor.
 	#
-	if (/^BEGIN-VENDOR\s+([\w-]+)/) {
+	if (/^BEGIN-VENDOR\s+([-\w]+)/) {
 	    $begin_vendor = 1;
 	    if (!defined $vendor) {
 		$vendor = $1;
@@ -106,7 +106,7 @@ while (@ARGV) {
 	#
 	#  Get attribute.
 	#
-	if (/^ATTRIBUTE\s+([\w-]+)\s+([\w.]+)\s+(\w+)(.*)/) {
+	if (/^ATTRIBUTE\s+([-\w]+)\s+([\w.]+)\s+(\w+)(.*)/) {
 	    $name=$1;
 	    $len = length $name;
 	    if ($len < 40) {
@@ -146,7 +146,7 @@ while (@ARGV) {
 	#
 	#  Values.
 	#
-	if (/^VALUE\s+([\w-]+)\s+([\w-\/,.]+)\s+(\w+)(.*)/) {
+	if (/^VALUE\s+([-\w]+)\s+([-\w\/,.]+)\s+(\w+)(.*)/) {
 	    $attr=$1;
 	    $len = length $attr;
 	    if ($len < 32) {