postgres.git / summary / log / commit / refs

commit    533315b68f8a00784686500f29ee780244341bc2
Author:   Andres Freund <andres@anarazel.de>
Date:     Tue Oct 19 17:14:49 2021 +0000

    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.


 src/test/ldap/t/001_auth.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
index 0dfc1f9ee19..0a310ccb15a 100644
--- 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);


[parent: 04dae19f4d50]