From d787d3f86174c725dc1ae34d9c6876351ea315c5 Mon Sep 17 00:00:00 2001
From: stroeder <stroeder>
Date: Thu, 27 Apr 2017 11:13:39 +0000
Subject: [PATCH] slapdtest now evaluates env var SLAPD for optionally pointing
 to OpenLDAP's slapd executable

---
 CHANGES          | 4 +++-
 Lib/slapdtest.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8629cb2..2482f05 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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/
 
@@ -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 $
diff --git a/Lib/slapdtest.py b/Lib/slapdtest.py
index 4939a78..836b71e 100644
--- a/Lib/slapdtest.py
+++ b/Lib/slapdtest.py
@@ -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
@@ -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)