From 8d7894c68e3f6dcb0301a89c4946b1ee6799bbe3 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Wed, 3 Apr 2024 20:58:21 -0700 Subject: [PATCH] clientupdate, net/dns: fix some "tailsacle" typos Updates #cleanup Change-Id: I982175e74b0c8c5b3e01a573e5785e6596b7ac39 Signed-off-by: Brad Fitzpatrick --- clientupdate/systemd_linux.go | 4 ++-- net/dns/direct_test.go | 10 +++++----- net/dns/resolvconffile/resolvconffile_test.go | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/clientupdate/systemd_linux.go b/clientupdate/systemd_linux.go index 810f7dd55..e34f6ace9 100644 --- a/clientupdate/systemd_linux.go +++ b/clientupdate/systemd_linux.go @@ -19,11 +19,11 @@ func restartSystemdUnit(ctx context.Context) error { } defer c.Close() if err := c.ReloadContext(ctx); err != nil { - return fmt.Errorf("failed to reload tailsacled.service: %w", err) + return fmt.Errorf("failed to reload tailscaled.service: %w", err) } ch := make(chan string, 1) if _, err := c.RestartUnitContext(ctx, "tailscaled.service", "replace", ch); err != nil { - return fmt.Errorf("failed to restart tailsacled.service: %w", err) + return fmt.Errorf("failed to restart tailscaled.service: %w", err) } select { case res := <-ch: diff --git a/net/dns/direct_test.go b/net/dns/direct_test.go index 575d37f0e..07202502e 100644 --- a/net/dns/direct_test.go +++ b/net/dns/direct_test.go @@ -177,17 +177,17 @@ func TestReadResolve(t *testing.T) { {in: `# nameserver 192.168.0.100`, want: OSConfig{}}, {in: `nameserver192.168.0.100`, wantErr: true}, - {in: `search tailsacle.com`, + {in: `search tailscale.com`, want: OSConfig{ - SearchDomains: []dnsname.FQDN{"tailsacle.com."}, + SearchDomains: []dnsname.FQDN{"tailscale.com."}, }, }, - {in: `search tailsacle.com # typo`, + {in: `search tailscale.com # comment`, want: OSConfig{ - SearchDomains: []dnsname.FQDN{"tailsacle.com."}, + SearchDomains: []dnsname.FQDN{"tailscale.com."}, }, }, - {in: `searchtailsacle.com`, wantErr: true}, + {in: `searchtailscale.com`, wantErr: true}, {in: `search`, wantErr: true}, } diff --git a/net/dns/resolvconffile/resolvconffile_test.go b/net/dns/resolvconffile/resolvconffile_test.go index 42bf09d66..4f5ddd599 100644 --- a/net/dns/resolvconffile/resolvconffile_test.go +++ b/net/dns/resolvconffile/resolvconffile_test.go @@ -44,17 +44,17 @@ func TestParse(t *testing.T) { {in: `# nameserver 192.168.0.100`, want: &Config{}}, {in: `nameserver192.168.0.100`, wantErr: true}, - {in: `search tailsacle.com`, + {in: `search tailscale.com`, want: &Config{ - SearchDomains: []dnsname.FQDN{"tailsacle.com."}, + SearchDomains: []dnsname.FQDN{"tailscale.com."}, }, }, - {in: `search tailsacle.com # typo`, + {in: `search tailscale.com # comment`, want: &Config{ - SearchDomains: []dnsname.FQDN{"tailsacle.com."}, + SearchDomains: []dnsname.FQDN{"tailscale.com."}, }, }, - {in: `searchtailsacle.com`, wantErr: true}, + {in: `searchtailscale.com`, wantErr: true}, {in: `search`, wantErr: true}, // Issue 6875: there can be multiple search domains, and even if they're