mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-04 15:07:22 +02:00
Adapt src/test/ldap/t/001_auth.pl to work with openldap 2.5.
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:
parent
ae7b1dd590
commit
9aef401557
@ -127,10 +127,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);
|
||||||
|
Loading…
Reference in New Issue
Block a user