|
|
|
@ -193,14 +193,14 @@ class desktop(share):
|
|
|
|
|
domain = self.clVars.Get("cl_remote_host")
|
|
|
|
|
if domain:
|
|
|
|
|
# Информация о пользователе из LDAP
|
|
|
|
|
userLdapInfo = ldapUserObj.getUserLdapInfo(userName)
|
|
|
|
|
userLdapInfo = self.ldapUserObj.getUserLdapInfo(userName)
|
|
|
|
|
if userLdapInfo:
|
|
|
|
|
uid = int(userLdapInfo['uid'])
|
|
|
|
|
gid = int(userLdapInfo['uid'])
|
|
|
|
|
homeDir = userLdapInfo['home']
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Can not found user %s in LDAP")%userName)
|
|
|
|
|
self.unmountUserRes()
|
|
|
|
|
self.umountUserRes()
|
|
|
|
|
return False
|
|
|
|
|
else:
|
|
|
|
|
pwdInfo = pwd.getpwnam(userName)
|
|
|
|
@ -224,7 +224,7 @@ class desktop(share):
|
|
|
|
|
if not dirsAndFiles:
|
|
|
|
|
# Отмонтируем пользовательские ресурсы в случае ошибки
|
|
|
|
|
self.printERROR(_("Can not apply user profile"))
|
|
|
|
|
self.unmountUserRes(homeDir)
|
|
|
|
|
self.umountUserRes(homeDir)
|
|
|
|
|
return False
|
|
|
|
|
if not flagHomeExists:
|
|
|
|
|
self.printSUCCESS(_("Created home dir %s")%homeDir + " ...")
|
|
|
|
@ -292,7 +292,7 @@ class desktop(share):
|
|
|
|
|
return False
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def unmountUserRes(self, homeDir=False):
|
|
|
|
|
def umountUserRes(self, homeDir=False):
|
|
|
|
|
"""Отмонтируем пользовательские директории если они есть"""
|
|
|
|
|
umountPaths = self.getMountUserPaths(homeDir)
|
|
|
|
|
ret = True
|
|
|
|
|