summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-09-26 10:12:47 -0700
committerVijay Bellur <vbellur@redhat.com>2014-09-29 01:30:44 -0700
commit37ee11f4d42bff1f46fae7d2755e0d6d8a55e572 (patch)
treec6c2b1e00c14cf389d3c37b1c27ebfca71237a6c
parent2a2f1130689d388f26b41f5df3e0bf572e0addb5 (diff)
Sane default for SSL on OSX
- /opt/local is not preferred anymore use /usr/local Change-Id: I30cad4cbd28850063f26121cace05371e13bb314 BUG: 1129939 Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-on: http://review.gluster.org/8872 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--rpc/rpc-transport/socket/src/socket.c2
-rwxr-xr-xtests/features/ssl-authz.t2
2 files changed, 2 insertions, 2 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index c7cc37bf950..cec0825f7d4 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -54,7 +54,7 @@
# define DEFAULT_ETC_SSL "/etc/openssl"
# endif
# ifdef GF_DARWIN_HOST_OS
-# define DEFAULT_ETC_SSL "/opt/local/etc/openssl"
+# define DEFAULT_ETC_SSL "/usr/local/etc/openssl"
# endif
# if !defined(DEFAULT_ETC_SSL)
# define DEFAULT_ETC_SSL "/etc/ssl"
diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t
index 4aabb1d14ec..72db389f5cf 100755
--- a/tests/features/ssl-authz.t
+++ b/tests/features/ssl-authz.t
@@ -6,7 +6,7 @@
ping_file () {
echo hello > $1 2> /dev/null
}
-for d in /etc/ssl /etc/openssl /opt/local/etc/openssl ; do
+for d in /etc/ssl /etc/openssl /usr/local/etc/openssl ; do
if test -d $d ; then
SSL_BASE=$d
break