summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-12-20 17:05:05 +0100
committerChristian Poessinger <christian@poessinger.com>2020-12-20 17:14:47 +0100
commit5dfdb8b1008f7198073a6b2c10e506fa1cf5a816 (patch)
treea765b3140c5d851e5b1aba7220595e7ea9ad0793 /src
parent34437ff4dee5fb9fb70bbc7c8b83ecb074793770 (diff)
downloadvyos-1x-5dfdb8b1008f7198073a6b2c10e506fa1cf5a816.tar.gz
vyos-1x-5dfdb8b1008f7198073a6b2c10e506fa1cf5a816.zip
Revert "dhcpv6: T3134: add missing duid support"
This reverts commit 9541355433e202fade4692851bffa33ba9d48f44.
Diffstat (limited to 'src')
-rwxr-xr-xsrc/validators/ipv6-duid27
-rwxr-xr-xsrc/validators/mac-address2
2 files changed, 2 insertions, 27 deletions
diff --git a/src/validators/ipv6-duid b/src/validators/ipv6-duid
deleted file mode 100755
index c0233b2f1..000000000
--- a/src/validators/ipv6-duid
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2020 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import re
-import sys
-
-pattern = "^([0-9A-Fa-f]{2}:){15}([0-9A-Fa-f]{2})$"
-
-if __name__ == '__main__':
- if len(sys.argv) != 2:
- sys.exit(1)
- if not re.match(pattern, sys.argv[1]):
- sys.exit(1)
- sys.exit(0)
diff --git a/src/validators/mac-address b/src/validators/mac-address
index 201dcaf12..b2d3496f4 100755
--- a/src/validators/mac-address
+++ b/src/validators/mac-address
@@ -17,8 +17,10 @@
import re
import sys
+
pattern = "^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$"
+
if __name__ == '__main__':
if len(sys.argv) != 2:
sys.exit(1)