Skip to content

Commit

Permalink
Use slapd -Tt instead of slaptest
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Ondřej Kuzník authored and Petr Viktorin committed Sep 20, 2019
1 parent da432d7 commit 532ffc0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Lib/slapdtest/_slapdtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ def _find_commands(self):
self.PATH_SLAPD = os.environ.get('SLAPD', None)
if not self.PATH_SLAPD:
self.PATH_SLAPD = self._find_command('slapd', in_sbin=True)
self.PATH_SLAPTEST = self._find_command('slaptest', in_sbin=True)

def _find_command(self, cmd, in_sbin=False):
if in_sbin:
Expand Down Expand Up @@ -378,7 +377,8 @@ def _write_config(self):
def _test_config(self):
self._log.debug('testing config %s', self._slapd_conf)
popen_list = [
self.PATH_SLAPTEST,
self.PATH_SLAPD,
'-Ttest',
"-f", self._slapd_conf,
'-u',
]
Expand Down

0 comments on commit 532ffc0

Please sign in to comment.