From 0fec990bcfaf909d9e0cbd23a6d272b0e8cdac84 Mon Sep 17 00:00:00 2001
From: Eugene Burkov <e.burkov@adguard.com>
Date: Fri, 26 May 2023 12:31:55 +0300
Subject: [PATCH] Pull request 1856: fix-dhcpd-tags
Merge in DNS/adguard-home from fix-dhcpd-tags to master
Updates #5615.
Squashed commit of the following:
commit 386b5a67b07cf8b06f4e4003870fbf3db5dfc94d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri May 26 12:23:41 2023 +0300
dhcpd: fix bsd tags
---
internal/dhcpd/{conn_darwin.go => conn_bsd.go} | 2 +-
.../{conn_darwin_internal_test.go => conn_bsd_internal_test.go} | 2 +-
internal/dhcpd/{conn_unix.go => conn_linux.go} | 2 +-
.../{conn_unix_internal_test.go => conn_linux_internal_test.go} | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename internal/dhcpd/{conn_darwin.go => conn_bsd.go} (99%)
rename internal/dhcpd/{conn_darwin_internal_test.go => conn_bsd_internal_test.go} (99%)
rename internal/dhcpd/{conn_unix.go => conn_linux.go} (99%)
rename internal/dhcpd/{conn_unix_internal_test.go => conn_linux_internal_test.go} (99%)
diff --git a/internal/dhcpd/conn_darwin.go b/internal/dhcpd/conn_bsd.go
similarity index 99%
rename from internal/dhcpd/conn_darwin.go
rename to internal/dhcpd/conn_bsd.go
index a80ae482..3a8aff93 100644
--- a/internal/dhcpd/conn_darwin.go
+++ b/internal/dhcpd/conn_bsd.go
@@ -1,4 +1,4 @@
-//go:build darwin
+//go:build darwin || freebsd || openbsd
package dhcpd
diff --git a/internal/dhcpd/conn_darwin_internal_test.go b/internal/dhcpd/conn_bsd_internal_test.go
similarity index 99%
rename from internal/dhcpd/conn_darwin_internal_test.go
rename to internal/dhcpd/conn_bsd_internal_test.go
index e0522a0f..9f3505b7 100644
--- a/internal/dhcpd/conn_darwin_internal_test.go
+++ b/internal/dhcpd/conn_bsd_internal_test.go
@@ -1,4 +1,4 @@
-//go:build darwin
+//go:build darwin || freebsd || openbsd
package dhcpd
diff --git a/internal/dhcpd/conn_unix.go b/internal/dhcpd/conn_linux.go
similarity index 99%
rename from internal/dhcpd/conn_unix.go
rename to internal/dhcpd/conn_linux.go
index 5602d126..1ebcc339 100644
--- a/internal/dhcpd/conn_unix.go
+++ b/internal/dhcpd/conn_linux.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux || openbsd
+//go:build linux
package dhcpd
diff --git a/internal/dhcpd/conn_unix_internal_test.go b/internal/dhcpd/conn_linux_internal_test.go
similarity index 99%
rename from internal/dhcpd/conn_unix_internal_test.go
rename to internal/dhcpd/conn_linux_internal_test.go
index ca68c1b9..ab344fd2 100644
--- a/internal/dhcpd/conn_unix_internal_test.go
+++ b/internal/dhcpd/conn_linux_internal_test.go
@@ -1,4 +1,4 @@
-//go:build freebsd || linux || openbsd
+//go:build linux
package dhcpd