Skip to content

Perf: import python-ldap lazily #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiarn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Perf: import python-ldap lazily #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion usr/lib/python3/dist-packages/linuxmusterLinuxclient7/gpo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion usr/lib/python3/dist-packages/linuxmusterLinuxclient7/ldapHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion usr/lib/python3/dist-packages/linuxmusterLinuxclient7/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading