Merge branch 'pr/76'

skriptble · skriptble · commit 44fa48dcf49c · 2018-08-03T11:50:01.000-04:00
Change-Id: Ibbae6ddbdf15c1a15977835bd93c02f427b7743b
diff --git a/mongo/clientopt/clientopt.go b/mongo/clientopt/clientopt.go
@@ -587,7 +587,7 @@ func SSL(ssl *SSLOpt) Option {
 				c.ConnString.SSL = ssl.Enabled
 				c.ConnString.SSLSet = true
 			}
-			if !c.ConnString.SSLClientCertificateKeyFileSet {
+			if !c.ConnString.SSLClientCertificateKeyFileSet && ssl.ClientCertificateKeyFile != "" {
 				c.ConnString.SSLClientCertificateKeyFile = ssl.ClientCertificateKeyFile
 				c.ConnString.SSLClientCertificateKeyFileSet = true
 			}

Original file line number	Diff line number	Diff line change
`@@ -587,7 +587,7 @@ func SSL(ssl *SSLOpt) Option {`
`587`	`587`	`c.ConnString.SSL = ssl.Enabled`
`588`	`588`	`c.ConnString.SSLSet = true`
`589`	`589`	`}`
`590`		`- if !c.ConnString.SSLClientCertificateKeyFileSet {`
	`590`	`+ if !c.ConnString.SSLClientCertificateKeyFileSet && ssl.ClientCertificateKeyFile != "" {`
`591`	`591`	`c.ConnString.SSLClientCertificateKeyFile = ssl.ClientCertificateKeyFile`
`592`	`592`	`c.ConnString.SSLClientCertificateKeyFileSet = true`
`593`	`593`	`}`