andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sane default for SSL on OSX

Browse Source 
- /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>
This commit is contained in:
Harshavardhana 2014-09-26 10:12:47 -07:00 committed by Vijay Bellur
parent 2a2f113068
commit 37ee11f4d4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/rpc-transport/socket/src/socket.c
View File

@ -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"

2
tests/features/ssl-authz.t
View File

@ -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