[aferen@xxxxxxxxxxxx (Andrew C. Feren)]

Minor patch to correct what looks like a cut and paste error in an
error message.  The wrong filename is being displayed if manuf can't
be opened for writing

Index: make-manuf
===================================================================
RCS file: /cvsroot/ethereal/make-manuf,v
retrieving revision 1.3
diff -u -r1.3 make-manuf
--- make-manuf	2001/10/07 22:19:14	1.3
+++ make-manuf	2002/03/14 14:58:53
@@ -61,7 +61,7 @@
   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>) {


Also took two minutes to add the rest of Cisco's OUIs to manuf.tmpl.
This way the name is always consistently spelled and capitalized in
the generated manuf file.

Index: manuf.tmpl
===================================================================
RCS file: /cvsroot/ethereal/manuf.tmpl,v
retrieving revision 1.4
diff -u -r1.4 manuf.tmpl
--- manuf.tmpl	2002/01/30 22:23:32	1.4
+++ manuf.tmpl	2002/03/14 15:14:45
@@ -103,39 +103,154 @@
 00:00:f0	Samsung
 00:00:f6	Madge
 00:00:f8	DEC
+00:01:42	Cisco
+00:01:64	Cisco
+00:01:96	Cisco
+00:01:97	Cisco
+00:01:c7	Cisco
+00:01:c9	Cisco
 00:01:fa	Compaq
 00:02:04	Novell
+00:02:17	Cisco
 00:02:31	Axis
+00:02:4a	Cisco
+00:02:4b	Cisco
+00:02:7d	Cisco
+00:02:7e	Cisco
+00:02:b9	Cisco
+00:02:ba	Cisco
+00:02:fc	Cisco
+00:02:fd	Cisco
+00:03:31	Cisco
+00:03:32	Cisco
+00:03:6b	Cisco
+00:03:6c	Cisco
+00:03:9f	Cisco
+00:03:a0	Cisco
+00:03:e3	Cisco
+00:03:e4	Cisco
+00:03:fd	Cisco
+00:03:fe	Cisco
 00:04:00	Lexmark
+00:04:27	Cisco
+00:04:28	Cisco
+00:04:4d	Cisco
+00:04:4e	Cisco
+00:04:6d	Cisco
+00:04:6e	Cisco
+00:04:9a	Cisco
+00:04:9b	Cisco
 00:04:ac	IBM
+00:04:c0	Cisco
+00:04:c1	Cisco
+00:04:dd	Cisco
+00:04:de	Cisco
+00:05:00	Cisco
+00:05:01	Cisco
+00:05:31	Cisco
+00:05:32	Cisco
+00:05:5e	Cisco
+00:05:5f	Cisco
+00:05:73	Cisco
+00:05:74	Cisco
+00:05:9b	Cisco
+00:05:dc	Cisco
+00:05:dd	Cisco
 00:06:0d	HP
+00:06:28	Cisco
 00:06:29	IBM
+00:06:2a	Cisco
+00:06:52	Cisco
+00:06:53	Cisco
 00:06:7c	Cisco
 00:06:c1	Cisco
+00:06:d6	Cisco
+00:06:d7	Cisco
 00:07:01	Cisco
 00:07:0d	Cisco
+00:07:0e	Cisco
+00:07:4f	Cisco
+00:07:50	Cisco
+00:07:84	Cisco
+00:07:85	Cisco
+00:07:b3	Cisco
+00:07:b4	Cisco
+00:07:eb	Cisco
+00:07:ec	Cisco
+00:08:20	Cisco
+00:08:21	Cisco
+00:08:7c	Cisco
+00:08:7d	Cisco
+00:08:a3	Cisco
+00:08:a4	Cisco
+00:08:c2	Cisco
 00:08:c7	Compaq
+00:08:e2	Cisco
+00:08:e3	Cisco
+00:09:11	Cisco
+00:09:12	Cisco
+00:09:43	Cisco
+00:09:44	Cisco
+00:09:7b	Cisco
+00:09:7c	Cisco
+00:10:07	Cisco
 00:10:0b	Cisco
+00:10:0d	Cisco
 00:10:11	Cisco
+00:10:14	Cisco
 00:10:1f	Cisco
+00:10:29	Cisco
 00:10:2f	Cisco
 00:10:4b	3Com
+00:10:54	Cisco
 00:10:67	Redback
 00:10:79	Cisco
 00:10:7b	Cisco
 00:10:a4	Xircom
+00:10:a6	Cisco
 00:10:f6	Cisco
+00:10:ff	Cisco
 00:20:00	Lexmark
 00:20:35	IBM
 00:20:85	3Com
 00:20:af	3Com
+00:30:19	Cisco
+00:30:24	Cisco
+00:30:40	Cisco
+00:30:71	Cisco
+00:30:78	Cisco
+00:30:7b	Cisco
+00:30:80	Cisco
+00:30:85	Cisco
+00:30:94	Cisco
+00:30:96	Cisco
+00:30:a3	Cisco
+00:30:b6	Cisco
+00:30:f2	Cisco
+00:40:0b	Cresc
 00:40:8c	Axis
 00:40:96	Aironet		# Cisco
+00:40:96	Ciron
 00:40:a6 	Cray
 00:40:c8	Milan
+00:50:0b	Cisco
+00:50:0f	Cisco
+00:50:14	Cisco
+00:50:2a	Cisco
+00:50:3e	Cisco
+00:50:50	Cisco
+00:50:53	Cisco
+00:50:54	Cisco
 00:50:56	VMware
+00:50:73	Cisco
+00:50:80	Cisco
 00:50:a2	Cisco
+00:50:a7	Cisco
 00:50:BA	D-link
+00:50:bd	Cisco
+00:50:d1	Cisco
+00:50:e2	Cisco
+00:50:f0	Cisco
 00:60:08	3Com
 00:60:09	Cisco
 00:60:1d	Lucent
@@ -160,23 +275,54 @@
 00:80:9f	Alcatel
 00:80:ad	Telebit
 00:80:c7	Xircom
+00:90:0c	Cisco
+00:90:21	Cisco
 00:90:27	Intel
+00:90:2b	Cisco
+00:90:5f	Cisco
 00:90:6d	Cisco
+00:90:6f	Cisco
+00:90:86	Cisco
+00:90:92	Cisco
+00:90:a6	Cisco
+00:90:ab	Cisco
 00:90:b1	Cisco
+00:90:bf	Cisco
+00:90:d9	Cisco
+00:90:f2	Cisco
 00:a0:24	3Com
 00:a0:57	ELSA
 00:a0:f9	BinTec			# BinTec Communications AG
 00:aa:00	Intel
+00:b0:4a	Cisco
+00:b0:64	Cisco
+00:b0:8e	Cisco
+00:b0:c2	Cisco
 00:b0:d0	Dell Computer Corp.
 00:c0:4f	Dell
 00:c0:7b	Ascend
 00:c0:95	Znyx            # Network Appliance
+00:d0:06	Cisco
+00:d0:58	Cisco
+00:d0:63	Cisco
+00:d0:79	Cisco
+00:d0:90	Cisco
+00:d0:97	Cisco
+00:d0:ba	Cisco
+00:d0:bb	Cisco
+00:d0:bc	Cisco
+00:d0:c0	Cisco
+00:d0:d3	Cisco
+00:d0:e4	Cisco
+00:d0:ff	Cisco
 00:e0:14	Cisco
 00:e0:1e	Cisco
 00:e0:34	Cisco
 00:e0:4f	Cisco
+00:e0:8f	Cisco
 00:e0:98	Trend
 00:e0:a3	Cisco
+00:e0:b0	Cisco
 00:e0:f7	Cisco
 00:e0:f9	Cisco
 00:e0:fe	Cisco


-- 
-Andrew Feren
 Cetacean Networks, Inc.
 Portsmouth, NH