From: Dan Fandrich <dan@coneharvesters.com>
Date: Wed, 3 Sep 2008 18:04:47 +0000 (+0000)
Subject: Search for the FreeBSD CA cert file /usr/local/share/certs/ca-root.crt
X-Git-Tag: curl-7_19_1~425
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=304537c24fa2dccaeb0b7e030147a57a0ab90a20;p=thirdparty%2Fcurl.git

Search for the FreeBSD CA cert file /usr/local/share/certs/ca-root.crt
---

diff --git a/CHANGES b/CHANGES
index fd723e4bbd..04b17401c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (3 Sep 2008)
+- Search for the FreeBSD CA cert file /usr/local/share/certs/ca-root.crt
+
 Daniel Fandrich (2 Sep 2008)
 - Fixed an out of memory problem that caused torture test failures in tests
   706 and 707.
diff --git a/acinclude.m4 b/acinclude.m4
index 59ef35d28c..61f6ef96f3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3444,6 +3444,7 @@ dnl regarding the paths this will scan:
 dnl /etc/ssl/certs/ca-certificates.crt Debian systems
 dnl /etc/pki/tls/certs/ca-bundle.crt Redhat and Mandriva
 dnl /usr/share/ssl/certs/ca-bundle.crt old(er) Redhat
+dnl /usr/local/share/certs/ca-root.crt FreeBSD
 dnl /etc/ssl/certs/ (ca path) SUSE
 
 AC_DEFUN([CURL_CHECK_CA_BUNDLE], [
@@ -3505,6 +3506,7 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]),
       for a in /etc/ssl/certs/ca-certificates.crt \
                /etc/pki/tls/certs/ca-bundle.crt \
                /usr/share/ssl/certs/ca-bundle.crt \
+               /usr/local/share/certs/ca-root.crt \
                "$cac"; do
         if test -f "$a"; then
           ca="$a"
@@ -3956,4 +3958,4 @@ AC_DEFUN([CURL_CHECK_WIN32_LARGEFILE], [
       AC_MSG_RESULT([no])
       ;;
   esac
-])
\ No newline at end of file
+])