|
|
@ -521,7 +521,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
(optDialog and options.has_key(optDialog)):
|
|
|
|
(optDialog and options.has_key(optDialog)):
|
|
|
|
if not pwdA or not (pwdA == pwdB):
|
|
|
|
if not pwdA or not (pwdA == pwdB):
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
self.printERROR (_("ERROR") + ": " +\
|
|
|
|
_("password incorrect")+ ": " + _("try again"))
|
|
|
|
_("passwords do not match"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
userPwd = pwdA
|
|
|
|
userPwd = pwdA
|
|
|
|
return userPwd
|
|
|
|
return userPwd
|
|
|
@ -806,7 +806,7 @@ conjunction with the 'login' or 'logout'")
|
|
|
|
if self.isRoot(False):
|
|
|
|
if self.isRoot(False):
|
|
|
|
self.printERROR(_("The user is root"))
|
|
|
|
self.printERROR(_("The user is root"))
|
|
|
|
self.printWARNING(\
|
|
|
|
self.printWARNING(\
|
|
|
|
_("The program can be executed from a non-root user"))
|
|
|
|
_("The program can be executed from a non-root user only"))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
# DNS имя хоста
|
|
|
|
# DNS имя хоста
|
|
|
|
data = self.getServerDataUser()
|
|
|
|
data = self.getServerDataUser()
|
|
|
|