From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 28 Aug 2015 15:17:03 +0000 (+0200)
Subject: [3965] Removed the spurious logic in the CSVLeaseFile6.
X-Git-Tag: trac3238_base~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ce879b35c761f77f534618d48be599f596aaf32;p=thirdparty%2Fkea.git

[3965] Removed the spurious logic in the CSVLeaseFile6.
---

diff --git a/src/lib/dhcpsrv/csv_lease_file6.cc b/src/lib/dhcpsrv/csv_lease_file6.cc
index 2d0963f4c3..ce1dcb5fa3 100644
--- a/src/lib/dhcpsrv/csv_lease_file6.cc
+++ b/src/lib/dhcpsrv/csv_lease_file6.cc
@@ -229,10 +229,7 @@ CSVLeaseFile6::readHWAddr(const CSVRow& row) {
         // Let's return a pointer to new freshly created copy.
         return (HWAddrPtr(new HWAddr(hwaddr)));
 
-    } catch (const CSVFileError&) {
-        // That's ok, we may be reading old CSV file that didn't store hwaddr
-        return (HWAddrPtr());
-    } catch (const BadValue& ex) {
+    } catch (const std::exception& ex) {
         // That's worse. There was something in the file, but its conversion
         // to HWAddr failed. Let's log it on warning and carry on.
         LOG_WARN(dhcpsrv_logger, DHCPSRV_MEMFILE_READ_HWADDR_FAIL)