From 877ebc28d575da672d108372bc20a59e7fa6897c Mon Sep 17 00:00:00 2001 From: lefayjey Date: Mon, 6 Feb 2023 18:28:36 +0100 Subject: [PATCH] Fix conf base for child domains --- cme/modules/adcs.py | 7 ++++--- cme/modules/subnets.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cme/modules/adcs.py b/cme/modules/adcs.py index 80faff53..8e208c9e 100644 --- a/cme/modules/adcs.py +++ b/cme/modules/adcs.py @@ -43,19 +43,20 @@ class CMEModule: try: sc = ldap.SimplePagedResultsControl() + baseDN_root=",".join(connection.ldapConnection._baseDN.split(",")[-2:]) if self.server is None: resp = connection.ldapConnection.search(searchFilter=search_filter, attributes=[], sizeLimit=0, searchControls=[sc], perRecordCallback=self.process_servers, - searchBase='CN=Configuration,' + connection.ldapConnection._baseDN) + searchBase='CN=Configuration,' + baseDN_root) else: - resp = connection.ldapConnection.search(searchFilter=search_filter + connection.ldapConnection._baseDN + ')', + resp = connection.ldapConnection.search(searchFilter=search_filter + baseDN_root + ')', attributes=['certificateTemplates'], sizeLimit=0, searchControls=[sc], perRecordCallback=self.process_templates, - searchBase='CN=Configuration,' + connection.ldapConnection._baseDN) + searchBase='CN=Configuration,' + baseDN_root) except LDAPSearchError as e: context.log.error('Obtained unexpected exception: {}'.format(str(e))) diff --git a/cme/modules/subnets.py b/cme/modules/subnets.py index a4380a3e..70443e3c 100644 --- a/cme/modules/subnets.py +++ b/cme/modules/subnets.py @@ -41,7 +41,7 @@ class CMEModule: multiple_hosts = False def on_login(self, context, connection): - dn = ','.join(["DC=%s" % part for part in connection.domain.split('.')]) + dn = ','.join(["DC=%s" % part for part in connection.domain.split('.')][-2:]) context.log.info('Getting the Sites and Subnets from domain')