From: Dave Cheney <dave@cheney.net>
Date: Mon, 12 Jan 2015 23:43:43 +0000 (+1100)
Subject: crypto/x509: add cert SmartOS cert path
X-Git-Tag: go1.5beta1~2364
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3c7bdd4d768444c349f6647b00465627d5ee1345;p=gostls13.git

crypto/x509: add cert SmartOS cert path

Fix SmartOS build that was broken in 682922908f7.

SmartOS pretends to be Ubuntu/Debian with respect to its SSL
certificate location.

Change-Id: I5405c6472c8a1e812e472e7301bf6084c17549d6
Reviewed-on: https://go-review.googlesource.com/2704
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/crypto/x509/root_solaris.go b/src/crypto/x509/root_solaris.go
index bf5d826e0d..3945c4432e 100644
--- a/src/crypto/x509/root_solaris.go
+++ b/src/crypto/x509/root_solaris.go
@@ -6,5 +6,6 @@ package x509
 
 // Possible certificate files; stop after finding one.
 var certFiles = []string{
-	"/etc/certs/ca-certificates.crt", // Solaris 11.2+
+	"/etc/certs/ca-certificates.crt",     // Solaris 11.2+
+	"/etc/ssl/certs/ca-certificates.crt", // Joyent SmartOS
 }