|
|
|
@ -228,7 +228,7 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
# список разделов, которые на наличие в ней информации
|
|
|
|
|
# используется для автоматического отображения/скрытия
|
|
|
|
|
# опций help-имя
|
|
|
|
|
# Пример: self.relOption =
|
|
|
|
|
# Пример: self.relOption =
|
|
|
|
|
# { "help-all":[_("Common options"], _("Service Unix options"),
|
|
|
|
|
# _("Service Samba options"), _("Service LDAP options")}]
|
|
|
|
|
# self.relChapterPass = (_("Common options"),)
|
|
|
|
@ -388,7 +388,7 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
'shortOption':"c",
|
|
|
|
|
'longOption':"comment",
|
|
|
|
|
'optVal':"COMMENT",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'helpChapter':_("Service Unix options"),
|
|
|
|
|
'help':_("new value of the GECOS field")
|
|
|
|
|
},
|
|
|
|
|
#{'progAccess':(5,),
|
|
|
|
@ -409,14 +409,14 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
'shortOption':"G",
|
|
|
|
|
'longOption':"groups",
|
|
|
|
|
'optVal':"GROUPS",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'helpChapter':_("Service Unix options"),
|
|
|
|
|
'help':_("new list of supplementary GROUPS")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(5,),
|
|
|
|
|
'shortOption':"a",
|
|
|
|
|
'longOption':"append",
|
|
|
|
|
'optVal':"GROUPS",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'helpChapter':_("Service Unix options"),
|
|
|
|
|
'help':_("append the user to the supplemental GROUPS")
|
|
|
|
|
},
|
|
|
|
|
#{'progAccess':(5,),
|
|
|
|
@ -448,7 +448,7 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
'shortOption':"s",
|
|
|
|
|
'longOption':"shell",
|
|
|
|
|
'optVal':"SHELL",
|
|
|
|
|
'helpChapter':_("Common options"),
|
|
|
|
|
'helpChapter':_("Service Unix options"),
|
|
|
|
|
'help':_("new login shell for the user account")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(5,),
|
|
|
|
@ -752,7 +752,7 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
# опция справки - доступна
|
|
|
|
|
return True
|
|
|
|
|
# если не оказалось не одной опция для разделов этой справки
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
# опция доступна, так как не справочная
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
@ -762,7 +762,7 @@ class cl_ldap(imp_cl_err, imp_cl_xml, imp_cl_help, imp_cl_smcon):
|
|
|
|
|
for par in self.data:
|
|
|
|
|
if par.has_key('helpChapter') and\
|
|
|
|
|
par['helpChapter'] == _("Services") and\
|
|
|
|
|
par.has_key('help'):
|
|
|
|
|
par.has_key('help') and self.access(par):
|
|
|
|
|
res = sServ.search(par['help'])
|
|
|
|
|
if res:
|
|
|
|
|
self.allServ.append(res.group(1))
|
|
|
|
@ -1357,7 +1357,7 @@ Samba in backup directory")
|
|
|
|
|
homeDir = os.path.join(baseDir, clVars.Get("soft_ldap_user_login"))
|
|
|
|
|
clVars.Set("soft_ldap_user_home",homeDir)
|
|
|
|
|
|
|
|
|
|
fullNameUser = "CDS user"
|
|
|
|
|
fullNameUser = "Calculate user"
|
|
|
|
|
# Полное имя пользователя
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
fullNameUser = options['c']
|
|
|
|
@ -1598,7 +1598,7 @@ Samba in backup directory")
|
|
|
|
|
return False
|
|
|
|
|
clVars.Set("soft_ldap_group_id", gid)
|
|
|
|
|
|
|
|
|
|
gecos = "CDS group"
|
|
|
|
|
gecos = "Calculate group"
|
|
|
|
|
# Коментарий к группе
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
gecos = options['c']
|
|
|
|
@ -2650,15 +2650,17 @@ Samba in backup directory")
|
|
|
|
|
#if not userPwd:
|
|
|
|
|
#return False
|
|
|
|
|
#else:
|
|
|
|
|
pwdA = getpass.getpass(pwDialog[0]+":")
|
|
|
|
|
pwdB = getpass.getpass(pwDialog[1]+":")
|
|
|
|
|
if not (pwdA == pwdB):
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("password incorrect")+ ": " + _("try again"))
|
|
|
|
|
return False
|
|
|
|
|
userPwd = pwdA
|
|
|
|
|
textLine = self.execProg("smbpasswd -a -s %s" %(userName),
|
|
|
|
|
"%s\n%s\n" %(userPwd,userPwd))
|
|
|
|
|
##pwdA = getpass.getpass(pwDialog[0]+":")
|
|
|
|
|
##pwdB = getpass.getpass(pwDialog[1]+":")
|
|
|
|
|
##if not (pwdA == pwdB):
|
|
|
|
|
##self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
##_("password incorrect")+ ": " + _("try again"))
|
|
|
|
|
##return False
|
|
|
|
|
##userPwd = pwdA
|
|
|
|
|
#userPwd = cl_utils.genpassword().strip()
|
|
|
|
|
#textLine = self.execProg("smbpasswd -a -s %s" %(userName),
|
|
|
|
|
#"%s\n%s\n" %(userPwd,userPwd))
|
|
|
|
|
textLine = self.execProg("smbpasswd -a -n %s" %(userName))
|
|
|
|
|
if "Added" in str(textLine):
|
|
|
|
|
self.printSUCCESS(_("Add user in samba service ..."))
|
|
|
|
|
return True
|
|
|
|
@ -2669,7 +2671,7 @@ Samba in backup directory")
|
|
|
|
|
|
|
|
|
|
class tsOpt(cl_base.opt):
|
|
|
|
|
"""Класс для обработки параметров и вывода help
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Параметры:
|
|
|
|
|
helpObj объект-справка содержащий необходимые опции
|
|
|
|
|
parBeforeService дополнительные необходимые параметры перед указанным
|
|
|
|
@ -2678,7 +2680,7 @@ class tsOpt(cl_base.opt):
|
|
|
|
|
def __init__(self, helpObj, parBeforeService):
|
|
|
|
|
# последний параметр является сервисом
|
|
|
|
|
service = sys.argv[-1:][0].rstrip()
|
|
|
|
|
# от cl_help получаем короткие и длинные опции
|
|
|
|
|
# от cl_help получаем короткие и длинные опции
|
|
|
|
|
if service in helpObj.allServ:
|
|
|
|
|
shortOpt, longOpt = helpObj.getAllOpt('all', helpObj.relServices[service])
|
|
|
|
|
else:
|
|
|
|
|