|
|
|
@ -174,9 +174,6 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
self.relDN = self.addDN(self.relServDN,self.ServicesDN)
|
|
|
|
|
# DN пользователей, относительно базового DN
|
|
|
|
|
self.relUsersDN = self.addDN(self.relUsDN, self.relDN)
|
|
|
|
|
# Имя пользователя
|
|
|
|
|
userName = os.environ['USER']
|
|
|
|
|
self.userName = userName.lower()
|
|
|
|
|
# Объект хранения переменных
|
|
|
|
|
self.clVars = False
|
|
|
|
|
|
|
|
|
@ -377,17 +374,15 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def createHome(self, userName=False):
|
|
|
|
|
def createHome(self, userName):
|
|
|
|
|
"""Создание пользовательской директории с настройками для kde4"""
|
|
|
|
|
# Подсоединяемся к серверу
|
|
|
|
|
#if not self.getLdapObjBind(server):
|
|
|
|
|
#return False
|
|
|
|
|
# Создаем объект переменных
|
|
|
|
|
self.createClVars()
|
|
|
|
|
if userName:
|
|
|
|
|
self.userName = userName
|
|
|
|
|
#uidGid = self.getUserUidGid(self.userName)
|
|
|
|
|
uidGid = self.getUidAndGidUser(self.userName)
|
|
|
|
|
#uidGid = self.getUserUidGid(userName)
|
|
|
|
|
uidGid = self.getUidAndGidUser(userName)
|
|
|
|
|
if not uidGid:
|
|
|
|
|
self.printERROR(_(" Not found user uid and gid"))
|
|
|
|
|
return False
|
|
|
|
@ -395,7 +390,7 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
gid = int(uidGid[1])
|
|
|
|
|
fullName = uidGid[2]
|
|
|
|
|
# Создаем пользовательскую директорию
|
|
|
|
|
homeDir = os.path.join("/home",self.userName)
|
|
|
|
|
homeDir = os.path.join("/home",userName)
|
|
|
|
|
self.clVars.Set('cl_root_path',homeDir,True)
|
|
|
|
|
if os.path.exists(homeDir) and os.listdir(homeDir):
|
|
|
|
|
self.printWARNING(_("home dir %s exists")%homeDir)
|
|
|
|
@ -403,7 +398,7 @@ class cl_client(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
if not os.path.exists(homeDir):
|
|
|
|
|
self.createUserDir(uid, gid, homeDir)
|
|
|
|
|
# Записываем переменную логин
|
|
|
|
|
self.clVars.Set('ur_login',self.userName)
|
|
|
|
|
self.clVars.Set('ur_login',userName)
|
|
|
|
|
self.clVars.Set('ur_fullname',fullName)
|
|
|
|
|
# Применяем профили для пользователя
|
|
|
|
|
if not self.applyProfilesFromUser():
|
|
|
|
|