From dee99295c12a41701446307e22de6ea137983cb6 Mon Sep 17 00:00:00 2001
From: root <root@ldaptest.swestore.se>
Date: Thu, 24 Aug 2023 13:47:23 +0200
Subject: [PATCH] added code to change str to bytes in createPersonAttrs to be
compatible with Python3
---
modified_time.txt | 2 +-
requirements.txt | 2 --
supr_ldap_krb.py | 6 ++++--
3 files changed, 5 insertions(+), 5 deletions(-)
delete mode 100644 requirements.txt
diff --git a/modified_time.txt b/modified_time.txt
index 0c76790..834684d 100644
--- a/modified_time.txt
+++ b/modified_time.txt
@@ -1 +1 @@
-2023-08-22 18:51:26
\ No newline at end of file
+2023-08-23 14:20:17
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 046ab61..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-python-ldap
-requests
diff --git a/supr_ldap_krb.py b/supr_ldap_krb.py
index ceb51f0..aa6266f 100644
--- a/supr_ldap_krb.py
+++ b/supr_ldap_krb.py
@@ -24,7 +24,7 @@ class SUPR_LDAP:
if all_projects or persons_modified:
# Get Logging File Handler
- self.logger = setup_log(self.__class__.__name__, "ldap")
+ self.logger = setup_log(self.__class__.__name__, settings.LOG_FILE)
# LDAP connection
self.l = None # TODO: Give this variable a better name
@@ -283,6 +283,8 @@ class SUPR_LDAP:
else:
attrsPerson['uid'] = self.getUID(m)
+ attrsPerson = {key:[v.encode("utf-8") if type(v) == str else v for v in values] for key, values in attrsPerson.items()}
+
return attrsPerson
def personChanged(self, result_data, attrsPerson):
@@ -487,7 +489,7 @@ class SUPR_LDAP:
attrsPerson = self.createPersonAttrs(m, uidNumber)
- personDN = "uid=" + attrsPerson['uid'] + "," + settings.peopleDN
+ personDN = "uid=" + str(attrsPerson['uid']) + "," + settings.peopleDN
if(result_data and self.personChanged(result_data, attrsPerson)):
self.l.delete_s(personDN)
--
GitLab