From 87db37180b3c57b105c4c5069aa196406a359db9 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 8 Jul 2020 22:23:34 +0100
Subject: [PATCH] #733 strip nonprinting characters from OUI table

---
 Changes             | 1 +
 bin/netdisco-deploy | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Changes b/Changes
index d113b869..e739bff5 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,7 @@
 
   [BUG FIXES]
 
+  * #733 strip nonprinting characters from OUI table
   * #227 Do not overwrite partially retrieved data with null or incorrect vals
   * #722 manual topology should not allow same left and right port/device
   * #729 Discovery partially fails on invalid indexes
diff --git a/bin/netdisco-deploy b/bin/netdisco-deploy
index bd9ff262..a57b986a 100755
--- a/bin/netdisco-deploy
+++ b/bin/netdisco-deploy
@@ -238,6 +238,7 @@ sub deploy_oui {
           if ($line =~ m/^\s*(.{2}-.{2}-.{2})\s+\(hex\)\s+(.*)\s*$/i) {
               my ($oui, $company) = ($1, $2);
               $oui =~ s/-/:/g;
+              $company =~ s/[\r\n]//g;
               my $abbrev = shorten($company);
               $data{lc($oui)}{'company'} = $company;
               $data{lc($oui)}{'abbrev'}  = $abbrev;