mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

FR #1096 by Henry Fallon: Corrections to string, Add missing comments in Murmur.ice and add Missing MainWindow::msgReject in Client

Browse Source
This commit is contained in:
Henry Fallon 2013-05-05 18:02:24 +01:00 committed by Kissaki
parent 52272e282c
commit 88d41e10f5
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mumble/Messages.cpp
View File

@ -103,6 +103,9 @@ void MainWindow::msgReject(const MumbleProto::Reject &msg) {
case MumbleProto::Reject_RejectType_WrongServerPW:
reason = tr("Wrong password");
break;
case MumbleProto::Reject_RejectType_AuthenticatorFail:
reason = tr("Your account information can not be verified currently. Please try again later");
break;
default:
break;
}

2
src/murmur/Messages.cpp
View File

@ -138,7 +138,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
reason = "Invalid server password";
rtType = MumbleProto::Reject_RejectType_WrongServerPW;
} else if (id==-3) {
reason = "Your account information can not be verified currently. Please try again later.";
reason = "Your account information can not be verified currently. Please try again later";
rtType = MumbleProto::Reject_RejectType_AuthenticatorFail;
} else {
ok = true;

2
src/murmur/Murmur.ice
View File

@ -352,7 +352,7 @@ module Murmur
* @param certstrong True if certificate was valid and signed by a trusted CA.
* @param newname Set this to change the username from the supplied one.
* @param groups List of groups on the root channel that the user will be added to for the duration of the connection.
* @return UserID of authenticated user, -1 for authentication failures and -2 for unknown user (fallthrough).
* @return UserID of authenticated user, -1 for authentication failures and -2 for unknown user (fallthrough). You can pass through -3 to notify the user they could not be authenticated at this time with a clearer message than -1 (The recommended usage of -3 is during SERVER_DOWN exception handling in your authenticator script to avoid user confusion i.e. Showing invalid username password message when their credentials are correct, but the cause is the authenticator is unable to validate due to MySQL/LDAP being unavailable)
*/
idempotent int authenticate(string name, string pw, CertificateList certificates, string certhash, bool certstrong, out string newname, out GroupNameList groups);