From: Andres Freund <andres@anarazel.de>
Date: Tue, 19 Oct 2021 17:14:49 +0000 (-0700)
Subject: Adapt src/test/ldap/t/001_auth.pl to work with openldap 2.5.
X-Git-Tag: REL_11_14~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4589c903599dc602f7d1e6facf161cc177adec9d;p=thirdparty%2Fpostgresql.git

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

diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index 992f01a2a50..e73e5401890 100644
--- a/src/test/ldap/t/001_auth.pl
+++ b/src/test/ldap/t/001_auth.pl
@@ -120,10 +120,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);