Switch to using slapd + -T<tool> for tool use

mistotebe · mistotebe · commit 29c3a53e0be6 · 2025-10-29T13:36:21.000Z
Using a locally compiled OpenLDAP impossible without this as libtool
wrappers eat argv[0] of the symlinked binaries.

Using a locally compiled OpenLDAP still often needs changes to the
configuration, this should be a reasonably easy step forward.
diff --git a/Lib/slapdtest/_slapdtest.py b/Lib/slapdtest/_slapdtest.py
@@ -259,7 +259,6 @@ def _find_commands(self):
         self.PATH_LDAPDELETE = self._find_command('ldapdelete')
         self.PATH_LDAPMODIFY = self._find_command('ldapmodify')
         self.PATH_LDAPWHOAMI = self._find_command('ldapwhoami')
-        self.PATH_SLAPADD = self._find_command('slapadd')
 
         self.PATH_SLAPD = os.environ.get('SLAPD', None)
         if not self.PATH_SLAPD:
@@ -276,7 +275,7 @@ def _find_command(self, cmd, in_sbin=False):
         if command is None:
             raise ValueError(
                 "Command '{}' not found. Set the {} environment variable to "
-                "override slapdtest's search path.".format(cmd, var_name)
+                "override slapdtest's search path: {}.".format(cmd, var_name, path)
             )
         return command
 
@@ -347,6 +346,7 @@ def gen_config(self):
             'cafile': self.cafile,
             'servercert': self.servercert,
             'serverkey': self.serverkey,
+            'slapd_path': self.SBIN_PATH,
         }
         return self.slapd_conf_template % config_dict
 
@@ -508,14 +508,17 @@ def _cli_auth_args(self):
 
     # no cover to avoid spurious coverage changes
     def _cli_popen(self, ldapcommand, extra_args=None, ldap_uri=None,
-                   stdin_data=None):  # pragma: no cover
+                   stdin_data=None, tool=None):  # pragma: no cover
         if ldap_uri is None:
             ldap_uri = self.default_ldap_uri
 
         if ldapcommand.split("/")[-1].startswith("ldap"):
             args = [ldapcommand, '-H', ldap_uri] + self._cli_auth_args()
         else:
-            args = [ldapcommand, '-F', self._slapd_conf]
+            if tool:
+                args = [ldapcommand, '-T', tool, '-F', self._slapd_conf]
+            else:
+                args = [ldapcommand, '-F', self._slapd_conf]
 
         args += (extra_args or [])
 
@@ -574,9 +577,10 @@ def slapadd(self, ldif, extra_args=None):
         Runs slapadd on this slapd instance, passing it the ldif content
         """
         self._cli_popen(
-            self.PATH_SLAPADD,
+            self.PATH_SLAPD,
             stdin_data=ldif.encode("utf-8") if ldif else None,
             extra_args=extra_args,
+            tool='add'
         )
 
     def __enter__(self):
