*** cfgmaker.2.10.16pre1	2004-11-18 13:22:26.000000000 -0500
--- cfgmaker.2.10.16pre1.dellLan	2004-11-18 13:21:45.000000000 -0500
***************
*** 130,140 ****
  	$routers->{$router}{deviceinfo}{sysDescr} =~ m/Version\s+(\d\d\.\d+)/) {
  	push @Variables,  ($1 > 11.0) ? "ifAlias" : "CiscolocIfDescr";
  	if ($1 > 11.2) {push @Variables, "vmVlan";};
!     } elsif ( $routers->{$router}{deviceinfo}{Vendor} eq 'juniper') {
!         push @Variables, "ifAlias";
!     } elsif ($routers->{$router}{deviceinfo}{Vendor} eq 'extremenetworks') {
!         push @Variables, "ifAlias";
!     } elsif ($routers->{$router}{deviceinfo}{Vendor} eq 'foundry') {
          push @Variables, "ifAlias";
      }
  
--- 130,136 ----
  	$routers->{$router}{deviceinfo}{sysDescr} =~ m/Version\s+(\d\d\.\d+)/) {
  	push @Variables,  ($1 > 11.0) ? "ifAlias" : "CiscolocIfDescr";
  	if ($1 > 11.2) {push @Variables, "vmVlan";};
!     } elsif ( $routers->{$router}{deviceinfo}{Vendor} =~ /(?:juniper|foundry|dellLan)/) {
          push @Variables, "ifAlias";
      }
  
***************
*** 848,867 ****
              $DevInfo{ $revOIDS{'1.3.6.1.2.1.1.'.$oid} } = $value;
          }
          # vendor identification
! 	for ($DevInfo{sysObjectID}) {
! 	    $DevInfo{Vendor} = 'cisco' if /^\Q1.3.6.1.4.1.9.\E/;
!             $DevInfo{Vendor} = 'juniper' if /^\Q1.3.6.1.4.1.2636.\E/;
! 	    $DevInfo{Vendor} = 'portmaster' if /^\Q1.3.6.1.4.1.307.\E/;
!             $DevInfo{Vendor} = 'foundry' if /^\Q1.3.6.1.4.1.1991.\E/;  
!             $DevInfo{Vendor} = '3com' if /^\Q1.3.6.1.4.1.43.\E/;  
!             $DevInfo{Vendor} = 'nokiaipsofw' if /^\Q1.3.6.1.4.1.94.\E/;
!             $DevInfo{Vendor} = 'extremenetworks' if /^\Q1.3.6.1.4.1.1916.\E/;
!             debug('base',"Vendor Id: $DevInfo{Vendor}");
! 	};
! 	return \%DevInfo;
      } else {
! 	# we just die because the snmp module has already complained
! 	return undef;
      }
  }
  
--- 844,869 ----
              $DevInfo{ $revOIDS{'1.3.6.1.2.1.1.'.$oid} } = $value;
          }
          # vendor identification
!         my %vendorIDs = (
!             # Add your vendor here
!             # sysObjectID                Vendora
!             '1.3.6.1.4.1.43.' =>        '3com',
!             '1.3.6.1.4.1.9.' =>         'cisco',
!             '1.3.6.1.4.1.674.10895.' => 'dellLan',
!             '1.3.6.1.4.1.1916.' =>      'extremenetworks',
!             '1.3.6.1.4.1.1991.' =>      'foundry',
!             '1.3.6.1.4.1.2636.' =>      'juniper',
!             '1.3.6.1.4.1.94.' =>        'nokiaipsofw',
!             '1.3.6.1.4.1.307.' =>       'portmaster'
!             );
!         foreach (keys %vendorIDs) {
!             $DevInfo{Vendor} = $vendorIDs{$_} if ($DevInfo{sysObjectID} =~ /\Q$_\E/);
!         }
!         debug('base',"Vendor Id: $DevInfo{Vendor}");
! 	    return \%DevInfo;
      } else {
! 	    # we just die because the snmp module has already complained
!     	return undef;
      }
  }