From 73dfce0a9159b0f350471686dcbd96e4b5fb2654 Mon Sep 17 00:00:00 2001 From: fram3d Date: Tue, 20 Jun 2023 20:05:17 +0200 Subject: [PATCH] add domain variable to return of expandbase function --- luser/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/luser/models.py b/luser/models.py index 4134691..387a652 100644 --- a/luser/models.py +++ b/luser/models.py @@ -23,6 +23,7 @@ class LUSER(): organization = '' dc = '' dcfull = '' + domain = '' # Find ou in base and set it as organization variable for i in baselist: @@ -39,19 +40,21 @@ class LUSER(): for i in baselist: if i.split('=')[0] == 'dc': # if first dc, add it from dc variable - if dcfull == '': + if dcfull == '' and domain='': dcfull = f'dc={dc}' + domain = dc else: dcfull += ',dc=' + i.split('=')[1] + domain += f'.{i.split('=')[1]}' - return organization, dc, dcfull + return organization, dc, dcfull, domain def __init__(self, ldap_host, admin_user, admin_pass, base, basealt='', autoconnect=True): self.ldap_host = ldap_host self.admin_user = admin_user self.admin_pass = admin_pass self.base = base - self.organization, self.dc, self.dcfull = self.expandbase() + self.organization, self.dc, self.dcfull, domain = self.expandbase() self.basealt = basealt self.alt = True self.autoconnect = autoconnect