|
|
|
@ -2952,7 +2952,7 @@ service"))
|
|
|
|
|
return True
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
def modGroupUnixServer(self, groupName, options):
|
|
|
|
|
def modGroupUnixServer(self, groupName, options, printSuccess=True):
|
|
|
|
|
"""Модифицирует настройки группы пользователей LDAP"""
|
|
|
|
|
# Проверим установлен ли сервис unix
|
|
|
|
|
if not self.initialChecks("unix"):
|
|
|
|
@ -2966,8 +2966,9 @@ service"))
|
|
|
|
|
users = options['a'].split(',')
|
|
|
|
|
res = self.addUsersGroupUnix(users, groupName)
|
|
|
|
|
if res:
|
|
|
|
|
self.printSUCCESS(_("Appended list of users to group") + " " +\
|
|
|
|
|
str(groupName))
|
|
|
|
|
if printSuccess:
|
|
|
|
|
self.printSUCCESS(_("Appended list of users to group") +\
|
|
|
|
|
" " + str(groupName))
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Can not append list of users to group") +\
|
|
|
|
|
" " + str(groupName))
|
|
|
|
@ -2978,7 +2979,8 @@ service"))
|
|
|
|
|
users = options['d'].split(',')
|
|
|
|
|
res = self.delUsersGroupUnix(users, groupName)
|
|
|
|
|
if res:
|
|
|
|
|
self.printSUCCESS(_("Deleted list users from group") + " " +\
|
|
|
|
|
if printSuccess:
|
|
|
|
|
self.printSUCCESS(_("Deleted list users from group")+" "+\
|
|
|
|
|
str(groupName))
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Can not delete list users from group") +\
|
|
|
|
@ -3005,7 +3007,8 @@ service"))
|
|
|
|
|
res = self.modifyElemDN(oldDN, newFirstDn)
|
|
|
|
|
if res:
|
|
|
|
|
modGroupName = newGroupName
|
|
|
|
|
self.printSUCCESS(_("Group renamed to %s")\
|
|
|
|
|
if printSuccess:
|
|
|
|
|
self.printSUCCESS(_("Group renamed to %s")\
|
|
|
|
|
%newGroupName)
|
|
|
|
|
else:
|
|
|
|
|
self.printERROR(_("Can not rename group"))
|
|
|
|
@ -3020,7 +3023,8 @@ service"))
|
|
|
|
|
res = self.modAttrsDN(groupDN, modAttrs)
|
|
|
|
|
if res:
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
|
self.printSUCCESS(_("Modified group comment"))
|
|
|
|
|
if printSuccess:
|
|
|
|
|
self.printSUCCESS(_("Modified group comment"))
|
|
|
|
|
return True
|
|
|
|
|
else:
|
|
|
|
|
if options.has_key('c'):
|
|
|
|
@ -3233,7 +3237,7 @@ class servMail(shareLdap):
|
|
|
|
|
userCrypt = "ssha"
|
|
|
|
|
|
|
|
|
|
# Динамическая группа Unix для добавления пользователя
|
|
|
|
|
defaultUnixGroup = {"name":"mail domain", "comment":"Default Mail Users"}
|
|
|
|
|
defaultUnixGroup = {"name":"mail_domain", "comment":"Default Mail Users"}
|
|
|
|
|
|
|
|
|
|
def __init__(self, unixObj=False):
|
|
|
|
|
shareLdap.__init__(self)
|
|
|
|
@ -4222,6 +4226,14 @@ mail user or group: %s")%foundReplUser)
|
|
|
|
|
optUnix['g'] = options['g']
|
|
|
|
|
else:
|
|
|
|
|
optUnix['g'] = self.defaultUnixGroup["name"]
|
|
|
|
|
# Проверяем необходимость переименовывания группы
|
|
|
|
|
oldGroupName = optUnix['g'].replace("_"," ")
|
|
|
|
|
if self.servUnixObj.searchUnixGroupName(oldGroupName) and\
|
|
|
|
|
not self.servUnixObj.searchUnixGroupName(optUnix['g']):
|
|
|
|
|
# Переименовываем группу
|
|
|
|
|
if not self.servUnixObj.modGroupUnixServer(oldGroupName,
|
|
|
|
|
{'n':optUnix['g']}, False):
|
|
|
|
|
return False
|
|
|
|
|
# Проверяем существование группы
|
|
|
|
|
if not self.servUnixObj.searchUnixGroupName(optUnix['g']):
|
|
|
|
|
flagCreateUnixGroup = True
|
|
|
|
@ -10037,7 +10049,7 @@ class servFtp(shareLdap):
|
|
|
|
|
ldifFileBase ="/usr/lib/calculate/calculate-server/ldif/ftp_base.ldif"
|
|
|
|
|
|
|
|
|
|
# Динамическая группа Unix для добавления пользователя
|
|
|
|
|
defaultUnixGroup = {"name":"ftp domain", "comment":"Default FTP Users"}
|
|
|
|
|
defaultUnixGroup = {"name":"ftp_domain", "comment":"Default FTP Users"}
|
|
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
|
shareLdap.__init__(self)
|
|
|
|
@ -10358,6 +10370,14 @@ class servFtp(shareLdap):
|
|
|
|
|
optUnix['g'] = options['g']
|
|
|
|
|
else:
|
|
|
|
|
optUnix['g'] = self.defaultUnixGroup["name"]
|
|
|
|
|
# Проверяем необходимость переименовывания группы
|
|
|
|
|
oldGroupName = optUnix['g'].replace("_"," ")
|
|
|
|
|
if self.servUnixObj.searchUnixGroupName(oldGroupName) and\
|
|
|
|
|
not self.servUnixObj.searchUnixGroupName(optUnix['g']):
|
|
|
|
|
# Переименовываем группу
|
|
|
|
|
if not self.servUnixObj.modGroupUnixServer(oldGroupName,
|
|
|
|
|
{'n':optUnix['g']}, False):
|
|
|
|
|
return False
|
|
|
|
|
# Проверяем существование группы
|
|
|
|
|
if not self.servUnixObj.searchUnixGroupName(optUnix['g']):
|
|
|
|
|
flagCreateUnixGroup = True
|
|
|
|
|