Correctly dissect LSA security descriptors, at least as they appear

[obnox/wireshark/wip.git] / make-manuf

diff --git a/make-manuf b/make-manuf
index e15cb672f85704a3260409aa9630cfca27f90380..7d5413d03f9bd39aef0e2fc5c3d752e45ef311eb 100755 (executable)
--- a/make-manuf
+++ b/make-manuf
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: make-manuf,v 1.1 2000/11/23 18:22:00 gerald Exp $
+# $Id: make-manuf,v 1.4 2002/03/14 21:22:11 guy Exp $
 #
 # Make-manuf - Creates a file containing ethernet OUIs and their
 # company IDs.  It merges the databases at
@@ -13,9 +13,11 @@
 # with the listing in "oui.txt", with the entries in "manuf.tmpl" taking
 # precedence.
 
+# LWP is part of the standard Perl module libwww 
 eval "require LWP::UserAgent;";
 if( $@ ) {
-  die "LWP isn't installed.  Bailing.\n";
+  die "LWP isn't installed. It is part of the standard Perl\n" .
+       " module libwww.  Bailing.\n";
 }
 
 $template = "manuf.tmpl";
@@ -59,7 +61,7 @@ open (TMPL, "< $template") ||
   die "Couldn't open template file for reading ($template)\n";
 
 open (OUT, "> $outfile") ||
-  die "Couldn't open template file for writing ($template)\n";
+  die "Couldn't open output file for writing ($outfile)\n";
 
 # Write out the header and populate the OUI list with our entries.
 while ($line = <TMPL>) {
@@ -68,6 +70,8 @@ while ($line = <TMPL>) {
     print(OUT "$line\n");
   } elsif (($oui, $manuf) = ($line =~ /^($oui_re)\s+(\S.*)$/)) {
     $inheader = 0;
+    # Ensure OUI is all upper-case
+    $oui =~ tr/a-f/A-F/;
     $oui_list{$oui} = $manuf;
     $tmpl_added++;
   }
@@ -77,6 +81,8 @@ foreach $line (split(/\n/, $cb_list)) {
   if (($oui, $manuf) = ($line =~ /^($cb_re)\s+(\S.*)$/)) {
     ($h1, $h2, $h3) = ($oui =~ /($hp)($hp)($hp)/);  # The CaveBear bytes have no separators
     $oui = "$h1:$h2:$h3";
+    # Ensure OUI is all upper-case
+    $oui =~ tr/a-f/A-F/;
     if (exists $oui_list{$oui}) {
       printf "$oui - Skipping CaveBear \"$manuf\" in favor of \"$oui_list{$oui}\"\n";
       $cb_skipped++;
@@ -90,6 +96,8 @@ foreach $line (split(/\n/, $cb_list)) {
 foreach $line (split(/\n/, $ieee_list)) {
   if (($oui, $manuf) = ($line =~ /^($ieee_re)\s+\(hex\)\s+(\S.*)$/)) {
     $oui =~ tr /-/:/;  # The IEEE bytes are separated by dashes.
+    # Ensure OUI is all upper-case
+    $oui =~ tr/a-f/A-F/;
     if (exists $oui_list{$oui}) {
       printf "$oui - Skipping IEEE \"$manuf\" in favor of \"$oui_list{$oui}\"\n";
       $ieee_skipped++;