From 42f3e84834eb11505d8df77494bfe662d5540746 Mon Sep 17 00:00:00 2001 From: pyldap contributors Date: Thu, 23 Nov 2017 22:38:40 +0100 Subject: [PATCH] slapdtest: Automatically try some common locations for SCHEMADIR --- Lib/slapdtest.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/slapdtest.py b/Lib/slapdtest.py index 3c6e549..2580ef3 100644 --- a/Lib/slapdtest.py +++ b/Lib/slapdtest.py @@ -105,7 +105,14 @@ class SlapdObject(object): TMPDIR = os.environ.get('TMP', os.getcwd()) SBINDIR = os.environ.get('SBIN', '/usr/sbin') BINDIR = os.environ.get('BIN', '/usr/bin') - SCHEMADIR = os.environ.get('SCHEMA', '/etc/openldap/schema') + if 'SCHEMA' in os.environ: + SCHEMADIR = os.environ['SCHEMA'] + elif os.path.isdir("/etc/openldap/schema"): + SCHEMADIR = "/etc/openldap/schema" + elif os.path.isdir("/etc/ldap/schema"): + SCHEMADIR = "/etc/ldap/schema" + else: + PATH_SCHEMA_CORE = None PATH_LDAPADD = os.path.join(BINDIR, 'ldapadd') PATH_LDAPMODIFY = os.path.join(BINDIR, 'ldapmodify') PATH_LDAPWHOAMI = os.path.join(BINDIR, 'ldapwhoami')