|
|
|
@ -19,7 +19,10 @@ import sys
|
|
|
|
|
from cl_utils import getpathenv, runOsCommand, typeFile
|
|
|
|
|
import re
|
|
|
|
|
from os import path
|
|
|
|
|
from cl_ldap import ldapUser
|
|
|
|
|
try:
|
|
|
|
|
from cl_ldap import ldapUser
|
|
|
|
|
except ImportError:
|
|
|
|
|
ldapUser = None
|
|
|
|
|
from operator import itemgetter
|
|
|
|
|
|
|
|
|
|
class clLocale:
|
|
|
|
@ -301,12 +304,13 @@ class varsShare:
|
|
|
|
|
if userName:
|
|
|
|
|
if userName in self._ldapUserData:
|
|
|
|
|
return self._ldapUserData[userName]
|
|
|
|
|
else:
|
|
|
|
|
elif not ldapUser is None:
|
|
|
|
|
ldapObj = self.getLdapUserObject()
|
|
|
|
|
userInfo = ldapObj.getUserLdapInfo(userName)
|
|
|
|
|
if userInfo:
|
|
|
|
|
self._ldapUserData[userName] = userInfo
|
|
|
|
|
return userInfo
|
|
|
|
|
if ldapObj:
|
|
|
|
|
userInfo = ldapObj.getUserLdapInfo(userName)
|
|
|
|
|
if userInfo:
|
|
|
|
|
self._ldapUserData[userName] = userInfo
|
|
|
|
|
return userInfo
|
|
|
|
|
return {}
|
|
|
|
|
|
|
|
|
|
def getLdapUserObject(self):
|
|
|
|
|