diff options
author | 2023-06-01 14:07:58 -0400 | |
---|---|---|
committer | 2023-06-01 14:07:58 -0400 | |
commit | d3965b8b607d691494078874c12eedbccc97b47e (patch) | |
tree | a287cabcde453e6d20be459a761db88ea5b78d45 /plugin/forward/setup.go | |
parent | d0375bc0269eccb1966ccf38a9b43263d551dee4 (diff) | |
download | coredns-d3965b8b607d691494078874c12eedbccc97b47e.tar.gz coredns-d3965b8b607d691494078874c12eedbccc97b47e.tar.zst coredns-d3965b8b607d691494078874c12eedbccc97b47e.zip |
Revert "plugin/tls: respect the path specified by root plugin (#5944)" (#6136)
This reverts commit d0375bc0269eccb1966ccf38a9b43263d551dee4.
Diffstat (limited to 'plugin/forward/setup.go')
-rw-r--r-- | plugin/forward/setup.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/plugin/forward/setup.go b/plugin/forward/setup.go index 2d2ff1914..6de0c870f 100644 --- a/plugin/forward/setup.go +++ b/plugin/forward/setup.go @@ -4,7 +4,6 @@ import ( "crypto/tls" "errors" "fmt" - "path/filepath" "strconv" "time" @@ -166,7 +165,6 @@ func parseStanza(c *caddy.Controller) (*Forward, error) { } func parseBlock(c *caddy.Controller, f *Forward) error { - config := dnsserver.GetConfig(c) switch c.Val() { case "except": ignore := c.RemainingArgs() @@ -232,11 +230,7 @@ func parseBlock(c *caddy.Controller, f *Forward) error { if len(args) > 3 { return c.ArgErr() } - for i := range args { - if !filepath.IsAbs(args[i]) && config.Root != "" { - args[i] = filepath.Join(config.Root, args[i]) - } - } + tlsConfig, err := pkgtls.NewTLSConfigFromArgs(args...) if err != nil { return err |