From 5c40cfeb4b5f8911df926c19f2dd628703840f64 Mon Sep 17 00:00:00 2001
From: Stefan Hacker <dd0t@users.sourceforge.net>
Date: Tue, 29 Jun 2010 23:39:16 +0200
Subject: [PATCH] Don't validate the name before we are sure it wasn't already
 validated by an authenticator

---
 src/murmur/Messages.cpp | 3 ---
 src/murmur/ServerDB.cpp | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp
index de307eae4..f12867a05 100644
--- a/src/murmur/Messages.cpp
+++ b/src/murmur/Messages.cpp
@@ -1231,9 +1231,6 @@ void Server::msgQueryUsers(ServerUser *uSource, MumbleProto::QueryUsers &msg) {
 
 	for (int i=0;i<msg.names_size();++i) {
 		QString name = u8(msg.names(i));
-		if (!validateUserName(name)) {
-			continue;
-		}
 		int id = getUserID(name);
 		if (id >= 0) {
 			name = getUserName(id);
diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp
index 7e15deff2..70b4ca44c 100644
--- a/src/murmur/ServerDB.cpp
+++ b/src/murmur/ServerDB.cpp
@@ -1048,6 +1048,11 @@ int Server::getUserID(const QString &name) {
 		qhUserNameCache.insert(id, name);
 		return id;
 	}
+
+	if (!validateUserName(name)) {
+	    return id;
+	}
+
 	TransactionHolder th;
 
 	QSqlQuery &query = *th.qsqQuery;