Skip to content

Commit

Permalink
slapdtest now evaluates env var SLAPD for optionally pointing to Open…
Browse files Browse the repository at this point in the history
…LDAP's slapd executable
  • Loading branch information
stroeder committed Apr 27, 2017
1 parent 92a8394 commit d787d3f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Released 2.4.38 2017-05-xx
Changes since 2.4.37:

Lib/
* slapdtest now evaluates env var SLAPD for optionally pointing
to OpenLDAP's slapd executable

Tests/

Expand Down Expand Up @@ -1418,4 +1420,4 @@ Released 2.0.0pre02 2002-02-01
----------------------------------------------------------------
Released 1.10alpha3 2000-09-19

$Id: CHANGES,v 1.436 2017/04/27 11:11:01 stroeder Exp $
$Id: CHANGES,v 1.437 2017/04/27 11:13:39 stroeder Exp $
4 changes: 2 additions & 2 deletions Lib/slapdtest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
See http://www.python-ldap.org/ for details.
\$Id: slapdtest.py,v 1.3 2017/04/27 11:11:01 stroeder Exp $
\$Id: slapdtest.py,v 1.4 2017/04/27 11:13:39 stroeder Exp $
Python compability note:
This module only works with Python 2.7.x since
Expand Down Expand Up @@ -105,7 +105,7 @@ class SlapdObject(object):
INIT_SCHEMA_PATH = os.environ.get('SCHEMA_PATH', os.path.join(SCHEMADIR, INIT_SCHEMA_FILE))
PATH_LDAPADD = os.path.join(BINDIR, 'ldapadd')
PATH_LDAPWHOAMI = os.path.join(BINDIR, 'ldapwhoami')
PATH_SLAPD = os.path.join(SBINDIR, 'slapd')
PATH_SLAPD = os.environ.get('SLAPD', os.path.join(SBINDIR, 'slapd'))
PATH_SLAPTEST = os.path.join(SBINDIR, 'slaptest')

# time in secs to wait before trying to access slapd via LDAP (again)
Expand Down

0 comments on commit d787d3f

Please sign in to comment.