|
|
|
@ -2072,6 +2072,13 @@ service"))
|
|
|
|
|
groupName = resGroup[0][0][1]['cn'][0]
|
|
|
|
|
if not self.delGroupUnixServer(groupName, {}, False):
|
|
|
|
|
return False
|
|
|
|
|
# Удаляем пользователя из ветки Worked в случае репликации
|
|
|
|
|
objRepl = servRepl()
|
|
|
|
|
if not objRepl.delReplWorkedUser(userName):
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("Can not remove user %s in the LDAP branch 'Worked'")\
|
|
|
|
|
% str(userName) + " ...")
|
|
|
|
|
return False
|
|
|
|
|
# Удаляем домашнюю директорию
|
|
|
|
|
if homeDir and os.path.exists(homeDir) and os.path.isdir(homeDir)\
|
|
|
|
|
and self.removeDir(homeDir):
|
|
|
|
@ -8037,7 +8044,7 @@ class servRepl(shareLdap):
|
|
|
|
|
users = os.listdir(".")
|
|
|
|
|
users = filter(lambda x: os.path.isdir(x), users)
|
|
|
|
|
for userName in users:
|
|
|
|
|
# Удаляем пользователя из ветки
|
|
|
|
|
# Удаляем пользователя из ветки Worked
|
|
|
|
|
if not self.delReplWorkedUser(userName):
|
|
|
|
|
errMessage = _("Can not remove user %s in the LDAP \
|
|
|
|
|
branch 'Worked'")
|
|
|
|
|