aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--acinclude.m44
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index fd723e4bb..04b17401c 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 59ef35d28..61f6ef96f 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
+])