From 440392d37beac78f66b5b35e0d8582b89c17a48d Mon Sep 17 00:00:00 2001 From: TomSweeneyRedHat Date: Fri, 13 Sep 2019 11:22:10 -0400 Subject: Vendor Bulidah 1.11.2 Vendor in Buildah 1.11.2 into libpod/Podman Signed-off-by: TomSweeneyRedHat --- vendor/github.com/coreos/go-systemd/activation/listeners.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vendor/github.com/coreos') diff --git a/vendor/github.com/coreos/go-systemd/activation/listeners.go b/vendor/github.com/coreos/go-systemd/activation/listeners.go index bb5cc2311..3dbe2b087 100644 --- a/vendor/github.com/coreos/go-systemd/activation/listeners.go +++ b/vendor/github.com/coreos/go-systemd/activation/listeners.go @@ -67,7 +67,7 @@ func TLSListeners(tlsConfig *tls.Config) ([]net.Listener, error) { return nil, err } - if tlsConfig != nil && err == nil { + if tlsConfig != nil { for i, l := range listeners { // Activate TLS only for TCP sockets if l.Addr().Network() == "tcp" { @@ -88,7 +88,7 @@ func TLSListenersWithNames(tlsConfig *tls.Config) (map[string][]net.Listener, er return nil, err } - if tlsConfig != nil && err == nil { + if tlsConfig != nil { for _, ll := range listeners { // Activate TLS only for TCP sockets for i, l := range ll { -- cgit v1.2.3-54-g00ecf