Fix get ldapUser info for work in minimal mode.

develop
Mike Hiretsky 14 years ago
parent 41961357e7
commit ea54e05efe

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

Loading…
Cancel
Save