From 50da2340fb574cc65842541754dbd04b98909ce4 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 14 Mar 2019 21:44:43 +0100 Subject: [PATCH] slapd: stop slapd if error occurs during __init__ --- src/ldaptools/slapd.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ldaptools/slapd.py b/src/ldaptools/slapd.py index 108e30a..f0e30bb 100644 --- a/src/ldaptools/slapd.py +++ b/src/ldaptools/slapd.py @@ -147,13 +147,17 @@ olcAccess: {{0}}to * for schema_ldif in self.schemas_ldif: self.slapadd(schema_ldif) self.start() - self.add_db('o=orga') - ldif = '''dn: o=orga + try: + self.add_db('o=orga') + ldif = '''dn: o=orga objectClass: organization o: orga ''' - self.add_ldif(ldif) + self.add_ldif(ldif) + except: + self.stop() + raise def add_db(self, suffix): path = os.path.join(self.slapd_dir, suffix)