diff --git a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/gpo.py b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/gpo.py index 1a845b2..1e48ea2 100644 --- a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/gpo.py +++ b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/gpo.py @@ -3,7 +3,7 @@ # 2. Site (does not apply) # 3. Domain # 4. OUs from top to bottom -import ldap, ldap.sasl, re, os.path +import re, os.path import xml.etree.ElementTree as ElementTree from linuxmusterLinuxclient7 import logging, constants, config, user, ldapHelper, shares, computer, printers diff --git a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/ldapHelper.py b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/ldapHelper.py index 9d8c124..32cbb21 100644 --- a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/ldapHelper.py +++ b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/ldapHelper.py @@ -1,4 +1,4 @@ -import ldap, ldap.sasl, sys, getpass, subprocess +import sys, getpass, subprocess from linuxmusterLinuxclient7 import logging, constants, config, user, computer _currentLdapConnection = None @@ -55,6 +55,7 @@ def searchOne(filter): :return: Tuple (success, ldap object as dict) :rtype: tuple """ + import ldap if conn() == None: logging.error("Cannot talk to LDAP") return False, None @@ -129,6 +130,7 @@ def _connect(): return True try: + import ldap.sasl sasl_auth = ldap.sasl.sasl({} ,'GSSAPI') _currentLdapConnection = ldap.initialize(serverUrl(), trace_level=0) # TODO: diff --git a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/user.py b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/user.py index 6ed989b..a49871a 100644 --- a/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/user.py +++ b/usr/lib/python3/dist-packages/linuxmusterLinuxclient7/user.py @@ -1,4 +1,4 @@ -import ldap, ldap.sasl, sys, getpass, subprocess, pwd, os, os.path +import sys, getpass, subprocess, pwd, os, os.path from pathlib import Path from linuxmusterLinuxclient7 import logging, constants, config, user, ldapHelper, shares, fileHelper, computer, localUserHelper