|
|
|
@ -1393,11 +1393,9 @@ class servUnix(shareLdap):
|
|
|
|
|
return False
|
|
|
|
|
# Ищем пользователя в Mail
|
|
|
|
|
if self.servMailObj.searchMailUserToName(userName):
|
|
|
|
|
#New
|
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
|
_("User %s is found in Mail service") %\
|
|
|
|
|
str(userName) + " ...")
|
|
|
|
|
#New
|
|
|
|
|
self.printWARNING(\
|
|
|
|
|
_("At first, need remove user from Mail service")
|
|
|
|
|
)
|
|
|
|
@ -3670,7 +3668,6 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'longOption':"alt-emails",
|
|
|
|
|
'optVal':_("ALT_EMAILS"),
|
|
|
|
|
'helpChapter':_("Mail service options"),
|
|
|
|
|
#New
|
|
|
|
|
'help':_("set alternate email addresses for the new mail group")
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(2,),
|
|
|
|
@ -3935,7 +3932,7 @@ class cl_ldap(shareLdap):
|
|
|
|
|
'longOption':"move-home",
|
|
|
|
|
'helpChapter':_("Unix service options"),
|
|
|
|
|
'help':_("move contents of the home directory to the new location")+\
|
|
|
|
|
" (" + _("use only with") + "-d)"
|
|
|
|
|
" (" + _("use only with") + " -d)"
|
|
|
|
|
},
|
|
|
|
|
{'progAccess':(5,),
|
|
|
|
|
'shortOption':"p",
|
|
|
|
|