Fix
This commit is contained in:
@ -72,7 +72,7 @@ index 0db4982..290d66e 100755
|
|||||||
nscd_start()
|
nscd_start()
|
||||||
log.del_lock()
|
log.del_lock()
|
||||||
diff --git usr/lib/python3/dist-packages/scribe/eoleldap.py usr/lib/python3/dist-packages/scribe/eoleldap.py
|
diff --git usr/lib/python3/dist-packages/scribe/eoleldap.py usr/lib/python3/dist-packages/scribe/eoleldap.py
|
||||||
index 45ec338..dd819eb 100644
|
index 45ec338..45c82a4 100644
|
||||||
--- usr/lib/python3/dist-packages/scribe/eoleldap.py
|
--- usr/lib/python3/dist-packages/scribe/eoleldap.py
|
||||||
+++ usr/lib/python3/dist-packages/scribe/eoleldap.py
|
+++ usr/lib/python3/dist-packages/scribe/eoleldap.py
|
||||||
@@ -8,21 +8,21 @@
|
@@ -8,21 +8,21 @@
|
||||||
@ -98,7 +98,7 @@ index 45ec338..dd819eb 100644
|
|||||||
def is_system_user(user):
|
def is_system_user(user):
|
||||||
"""
|
"""
|
||||||
indique si le login proposé est déjà un utilisateur système
|
indique si le login proposé est déjà un utilisateur système
|
||||||
@@ -120,75 +120,83 @@ class _Ldap(object):
|
@@ -120,73 +120,81 @@ class _Ldap(object):
|
||||||
class _LdapEntry(object):
|
class _LdapEntry(object):
|
||||||
"""
|
"""
|
||||||
classe de base pour gérer les entrées ldap
|
classe de base pour gérer les entrées ldap
|
||||||
@ -181,8 +181,7 @@ index 45ec338..dd819eb 100644
|
|||||||
- elif self._is_user(name):
|
- elif self._is_user(name):
|
||||||
+ elif self._is_user(name, etab=etab):
|
+ elif self._is_user(name, etab=etab):
|
||||||
raise LdapExistingUser
|
raise LdapExistingUser
|
||||||
- elif is_system_user(name):
|
elif is_system_user(name):
|
||||||
+ elif is_system_user(name, etab=etab):
|
|
||||||
raise SystemExistingUser
|
raise SystemExistingUser
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@ -191,8 +190,6 @@ index 45ec338..dd819eb 100644
|
|||||||
Retourne le niveau associé à la classe
|
Retourne le niveau associé à la classe
|
||||||
"""
|
"""
|
||||||
self.ldap_admin.connect()
|
self.ldap_admin.connect()
|
||||||
res = self._get_niveau(classe)
|
|
||||||
self.ldap_admin.close()
|
|
||||||
diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py
|
diff --git usr/lib/python3/dist-packages/scribe/eoleuser.py usr/lib/python3/dist-packages/scribe/eoleuser.py
|
||||||
index 05569fd..b4a4fb8 100644
|
index 05569fd..b4a4fb8 100644
|
||||||
--- usr/lib/python3/dist-packages/scribe/eoleuser.py
|
--- usr/lib/python3/dist-packages/scribe/eoleuser.py
|
||||||
|
Reference in New Issue
Block a user