Skip to content
Permalink
Browse files

FR #1096 by Henry Fallon: Corrections to string, Add missing comments…

… in Murmur.ice and add Missing MainWindow::msgReject in Client
  • Loading branch information...
hjf288 authored and Kissaki committed May 5, 2013
1 parent 52272e2 commit 88d41e10f5996cc2c1b24f2ba6a291a3f429753d
Showing with 5 additions and 2 deletions.
  1. +3 −0 src/mumble/Messages.cpp
  2. +1 −1 src/murmur/Messages.cpp
  3. +1 −1 src/murmur/Murmur.ice
@@ -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;
}
@@ -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;
@@ -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);

0 comments on commit 88d41e1

Please sign in to comment.
You can’t perform that action at this time.