add motorola canopy attributes from wtxs, neaten up raddb.pm generation

1 files changed, 10 insertions, 3 deletions

diff --git a/bin/generate-raddb b/bin/generate-raddb
index c8843abcf..af21c05a8 100755
--- a/bin/generate-raddb
+++ b/bin/generate-raddb
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # usage: generate-raddb radius-server/raddb/dictionary* >raddb.pm
-#  i.e.: generate-raddb ~/freeradius/freeradius-1.0.4/share/dictionary* /home/ivan/wirelessoceans/dictionary.ip3networks >raddb.pm.new
+#  i.e.: generate-raddb ~/freeradius/freeradius-1.0.5/share/dictionary* ~/wirelessoceans/dictionary.ip3networks ~/wtxs/dictionary.mot.canopy >raddb.pm.new
 print <<END;
 package FS::raddb;
 use vars qw(%attrib);
@@ -28,17 +28,24 @@ while (<>) {
   #print "$2\n";
 }
 
-foreach ( keys %hash ) {
+foreach ( sort keys %hash ) {
 #  print "$_\n" if length($_)>24;
 #  print substr($_,0,24),"\n" if length($_)>24; 
 #  $max = length($_) if length($_)>$max;
 # have to fudge things since everything >24 is *not* unique
 
   #print "  '". substr($_,0,24). "' => '$hash{$_}',\n";
-  print "  '$_' => '$hash{$_}',\n";
+  print "  '$_' ". ( " " x (24-length($_) ) ). "=> '$hash{$_}',\n";
 }
 
 print <<END;
+
+  #NETC.NET.AU (RADIATOR?)
+  'authentication_type'      => 'Authentication-Type',
+
+  #wtxs (dunno)
+  #'radius_operator'          => 'Radius-Operator',
+
 );
 
 1;