mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adapt src/test/ldap/t/001_auth.pl to work with openldap 2.5.

Browse Source 
ldapsearch's deprecated -h/-p arguments were removed, need to use -H now -
which has been around for over 20 years.

As perltidy insists on reflowing the parameters anyway, change order and
"phrasing" to yield a less confusing layout (per suggestion from Tom Lane).

Discussion: https://postgr.es/m/20211009233850.wvr6apcrw2ai6cnj@alap3.anarazel.de
Backpatch: 11-, where the tests were added.
This commit is contained in:
Andres Freund 2021-10-19 10:14:49 -07:00
parent b4c4a00ead
commit 984f460e2f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,10 +130,12 @@ while (1)
last last
if ( if (
system_log( system_log(
"ldapsearch", "-h", $ldap_server, "-p", "ldapsearch", "-sbase",
$ldap_port, "-s", "base", "-b", "-H", $ldap_url,
$ldap_basedn, "-D", $ldap_rootdn, "-y", "-b", $ldap_basedn,
$ldap_pwfile, "-n", "'objectclass=*'") == 0); "-D", $ldap_rootdn,
"-y", $ldap_pwfile,
"-n", "'objectclass=*'") == 0);
die "cannot connect to slapd" if ++$retries >= 300; die "cannot connect to slapd" if ++$retries >= 300;
note "waiting for slapd to accept requests..."; note "waiting for slapd to accept requests...";
Time::HiRes::usleep(1000000); Time::HiRes::usleep(1000000);