Skip to content

Commit 532ffc0

Browse files
mistotebeencukou
authored andcommitted
Use slapd -Tt instead of slaptest
If we point SBIN to $openldap_source/servers/slapd, libtool scripts will munge argv[0] and slapd won't recognise it's slaptest we asked for. So just request a slapd tool directly.
1 parent da432d7 commit 532ffc0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Lib/slapdtest/_slapdtest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ def _find_commands(self):
252252
self.PATH_SLAPD = os.environ.get('SLAPD', None)
253253
if not self.PATH_SLAPD:
254254
self.PATH_SLAPD = self._find_command('slapd', in_sbin=True)
255-
self.PATH_SLAPTEST = self._find_command('slaptest', in_sbin=True)
256255

257256
def _find_command(self, cmd, in_sbin=False):
258257
if in_sbin:
@@ -378,7 +377,8 @@ def _write_config(self):
378377
def _test_config(self):
379378
self._log.debug('testing config %s', self._slapd_conf)
380379
popen_list = [
381-
self.PATH_SLAPTEST,
380+
self.PATH_SLAPD,
381+
'-Ttest',
382382
"-f", self._slapd_conf,
383383
'-u',
384384
]

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy