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[email protected]
Backpatch: 11-, where the tests were added.

diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index f670bc5e0d52f5d48a1b87fa1fd4d837b4600f5b..104002d149ad1565a489be58b32423e36d7cd1ef 100644 (file)
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -130,10 +130,12 @@ while (1)
    last
      if (
        system_log(
-           "ldapsearch", "-h", $ldap_server, "-p",
-           $ldap_port,   "-s", "base",       "-b",
-           $ldap_basedn, "-D", $ldap_rootdn, "-y",
-           $ldap_pwfile, "-n", "'objectclass=*'") == 0);
+           "ldapsearch", "-sbase",
+           "-H",         $ldap_url,
+           "-b",         $ldap_basedn,
+           "-D",         $ldap_rootdn,
+           "-y",         $ldap_pwfile,
+           "-n",         "'objectclass=*'") == 0);
    die "cannot connect to slapd" if ++$retries >= 300;
    note "waiting for slapd to accept requests...";
    Time::HiRes::usleep(1000000);