Browse code

Merge pull request #30730 from dmcgowan/update-go-connections-1.13

[1.13] Update go connections 1.13

Victor Vieux authored on 2017/02/04 13:53:35
Showing 3 changed files
... ...
@@ -17,7 +17,7 @@ github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
17 17
 golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
18 18
 golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
19 19
 github.com/docker/go-units 8a7beacffa3009a9ac66bad506b18ffdd110cf97
20
-github.com/docker/go-connections 4ccf312bf1d35e5dbda654e57a9be4c3f3cd0366
20
+github.com/docker/go-connections ecb4cb2dd420ada7df7f2593d6c25441f65f69f2
21 21
 
22 22
 github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5
23 23
 github.com/imdario/mergo 0.2.1
... ...
@@ -14,7 +14,7 @@ import (
14 14
 func SystemCertPool() (*x509.CertPool, error) {
15 15
 	certpool, err := x509.SystemCertPool()
16 16
 	if err != nil && runtime.GOOS == "windows" {
17
-		logrus.Warnf("Unable to use system certificate pool: %v", err)
17
+		logrus.Infof("Unable to use system certificate pool: %v", err)
18 18
 		return x509.NewCertPool(), nil
19 19
 	}
20 20
 	return certpool, err
... ...
@@ -118,7 +118,7 @@ func Server(options Options) (*tls.Config, error) {
118 118
 		return nil, fmt.Errorf("Error reading X509 key pair (cert: %q, key: %q): %v. Make sure the key is not encrypted.", options.CertFile, options.KeyFile, err)
119 119
 	}
120 120
 	tlsConfig.Certificates = []tls.Certificate{tlsCert}
121
-	if options.ClientAuth >= tls.VerifyClientCertIfGiven {
121
+	if options.ClientAuth >= tls.VerifyClientCertIfGiven && options.CAFile != "" {
122 122
 		CAs, err := certPool(options.CAFile)
123 123
 		if err != nil {
124 124
 			return nil, err