|
|
|
@ -1462,7 +1462,6 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
if not self.mountRemote():
|
|
|
|
|
return False
|
|
|
|
|
# Записываем действие, введен в домен
|
|
|
|
|
self.clVars.Write("cl_pass_action", "domain", True)
|
|
|
|
|
self.printOK(_("To be used domain profile") + " ...")
|
|
|
|
|
else:
|
|
|
|
|
self.printOK(_("To be used local profile") + " ...")
|
|
|
|
@ -1492,7 +1491,7 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
if not self.isRoot():
|
|
|
|
|
return False
|
|
|
|
|
# Действие выход из домена
|
|
|
|
|
self.clVars.Set("cl_pass_action", "undomain", True)
|
|
|
|
|
self.clVars.Set("cl_action", "uninstall", True)
|
|
|
|
|
# Удаляем переменные из env файлов
|
|
|
|
|
self.removeVars()
|
|
|
|
|
if not self.applyTemplatesFromSystem():
|
|
|
|
@ -1506,7 +1505,6 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
self.clVars.Get("cl_env_path")[0]))
|
|
|
|
|
return False
|
|
|
|
|
# Записываем действие, выведен из домена
|
|
|
|
|
self.clVars.Write("cl_pass_action", "undomain", True)
|
|
|
|
|
self.printOK(_("Apply uninstall templates"))
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -1550,7 +1548,7 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
# Удаляем переменные из env файлов
|
|
|
|
|
self.removeVars()
|
|
|
|
|
# Устанавливаем действие выход из домена
|
|
|
|
|
self.clVars.Set("cl_pass_action", "undomain", True)
|
|
|
|
|
self.clVars.Set("cl_action", "undomain", True)
|
|
|
|
|
if not self.applyTemplatesFromSystem():
|
|
|
|
|
self.printERROR(_("Can not apply undomain templates"))
|
|
|
|
|
return False
|
|
|
|
@ -1560,7 +1558,6 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
if not self.delDaemonAutostart("client"):
|
|
|
|
|
return False
|
|
|
|
|
# Записываем действие, введен в домен
|
|
|
|
|
self.clVars.Write("cl_pass_action", "undomain", True)
|
|
|
|
|
self.printOK(_("Computer removed from domain %s")%domain + " ...")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -1726,7 +1723,7 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
return False
|
|
|
|
|
# Наложим шаблоны - domain
|
|
|
|
|
# Действие - ввод в домен
|
|
|
|
|
self.clVars.Set("cl_pass_action", "domain", True)
|
|
|
|
|
self.clVars.Set("cl_action", "domain", True)
|
|
|
|
|
# Доменная авторизация
|
|
|
|
|
self.clVars.Set("os_remote_auth", domain)
|
|
|
|
|
if not self.applyTemplatesFromSystem():
|
|
|
|
@ -1742,7 +1739,6 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
currentVersion = self.clVars.Get("cl_ver")
|
|
|
|
|
self.clVars.Write("os_remote_client", currentVersion, True)
|
|
|
|
|
# Записываем действие, введен в домен
|
|
|
|
|
self.clVars.Write("cl_pass_action", "domain", True)
|
|
|
|
|
self.printOK(_("Computer added to domain %s")%domain + " ...")
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -1777,10 +1773,10 @@ class client(share, commandServer, encrypt):
|
|
|
|
|
if not self.relevanceTemplates(hostAuth):
|
|
|
|
|
if hostAuth:
|
|
|
|
|
# Устанавливаем действие вход в домен
|
|
|
|
|
self.clVars.Set("cl_pass_action","domain",True)
|
|
|
|
|
self.clVars.Set("cl_action","domain",True)
|
|
|
|
|
else:
|
|
|
|
|
# Устанавливаем действие выход из домена
|
|
|
|
|
self.clVars.Set("cl_pass_action","undomain",True)
|
|
|
|
|
self.clVars.Set("cl_action","undomain",True)
|
|
|
|
|
self.clVars.Set("os_remote_auth", hostAuth)
|
|
|
|
|
# Наложим шаблоны
|
|
|
|
|
dirsAndFiles = self.applyTemplatesFromSystem()
|
|
|
|
|