diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-09-13 11:22:10 -0400 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2019-09-13 11:22:14 -0400 |
| commit | 440392d37beac78f66b5b35e0d8582b89c17a48d (patch) | |
| tree | ab3131fc54b36ea773f20a7717dc55819108de3f /vendor/github.com/coreos | |
| parent | 5c09c4d2947a759724f9d5aef6bac04317e03f7e (diff) | |
| download | podman-440392d37beac78f66b5b35e0d8582b89c17a48d.tar.gz podman-440392d37beac78f66b5b35e0d8582b89c17a48d.tar.bz2 podman-440392d37beac78f66b5b35e0d8582b89c17a48d.zip | |
Vendor Bulidah 1.11.2
Vendor in Buildah 1.11.2 into libpod/Podman
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'vendor/github.com/coreos')
| -rw-r--r-- | vendor/github.com/coreos/go-systemd/activation/listeners.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |