From 95c494d9fcfd007d7e1a75f4d8e73b01c513a18a Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 16 Mar 2015 19:01:14 -0700
Subject: [PATCH] Handle un-formatted MAC addresses

---
 dhcpd/save_host.cgi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dhcpd/save_host.cgi b/dhcpd/save_host.cgi
index 9dfc081a4..de10706a3 100755
--- a/dhcpd/save_host.cgi
+++ b/dhcpd/save_host.cgi
@@ -80,6 +80,10 @@ else {
 		if ($in{'hardware'} =~ /^([0-9a-f]{2})([0-9a-f]{2}).([0-9a-f]{2})([0-9a-f]{2}).([0-9a-f]{2})([0-9a-f]{2}).([0-9a-f]{2})([0-9a-f]{2})$/i) {
 			$in{'hardware'} = "$1:$2:$3:$4:$5:$6";
 			}
+		# Handle an Ethernet address with no formatting at all
+		if ($in{'hardware'} =~ /^([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i) {
+			$in{'hardware'} = "$1:$2:$3:$4:$5:$6";
+			}
 		$in{'hardware'} =~ /^([0-9a-f]{1,2}:)*[0-9a-f]{1,2}$/i ||
 			&error(&text('shost_invalidhwa', $in{'hardware'},
 				     $in{'hardware_type'}) );