database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Add MacPorts support to src/test/ldap tests.

Browse Source 
Previously the test knew how to find an OpenLDAP installation at the
paths used by Homebrew.  Add the MacPorts paths too.

Author: Thomas Munro
Reviewed-by: Tom Lane
Discussion: https://postgr.es/m/CA%2BhUKGKrjGS7sO4jc53gp3qipCtEvThtdP_%3DzoixgX5ZBq4Nbw%40mail.gmail.com
This commit is contained in:
Thomas Munro
2019-03-26 10:39:03 +13:00
parent f7111f72d2
commit aa1419e63f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/ldap/README
View File

@@ -49,4 +49,4 @@ and net/openldap24-server.)
macOS: We do not recommend trying to use the Apple-provided version of
OpenLDAP; it's very old, plus Apple seem to have changed the launching
conventions for slapd. The paths in the test file are set on the
assumption that you installed OpenLDAP using Homebrew.
assumption that you installed OpenLDAP using Homebrew or MacPorts.

9
src/test/ldap/t/001_auth.pl
View File

@@ -17,11 +17,18 @@ my ($slapd, $ldap_bin_dir, $ldap_schema_dir);
$ldap_bin_dir = undef; # usually in PATH
if ($^O eq 'darwin')
if ($^O eq 'darwin' && -d '/usr/local/opt/openldap')
{
# typical paths for Homebrew
$slapd = '/usr/local/opt/openldap/libexec/slapd';
$ldap_schema_dir = '/usr/local/etc/openldap/schema';
}
elsif ($^O eq 'darwin' && -d '/opt/local/etc/openldap')
{
# typical paths for MacPorts
$slapd = '/opt/local/libexec/slapd';
$ldap_schema_dir = '/opt/local/etc/openldap/schema';
}
elsif ($^O eq 'linux')
{
$slapd = '/usr/sbin/slapd';