X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=0b7c2328db534da0c83ee69fe1b025ad2303a4d4;hb=1f6407aa1a69c734dfeb202a967609c99403f947;hp=1b94204294e4393fc877ef1fcd55669e053f69d1;hpb=4f5079fe2b925b52a21162267614f4f5ed8f5a6b;p=umurmur.git

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 1b94204..0b7c232 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -122,20 +122,16 @@ void Mh_handle_message(client_t *client, message_t *msg)
 			if (msg->payload.authenticate->n_tokens > 0) {
 				Log_debug("Tokens in auth message from '%s'. n_tokens = %d", client->username,
 				          msg->payload.authenticate->n_tokens);
-				addTokens(client, msg);
-				
-				/* Check if admin PW among tokens */
-				if (strlen(getStrConf(ADMIN_PASSPHRASE)) > 0 &&
-				    Client_token_match(client, getStrConf(ADMIN_PASSPHRASE))) {
-					client->isAdmin = true;
-					Log_info("User is admin");
-				}				
+				addTokens(client, msg);				
 			}
 			break;
 		}
 		
-		client->authenticated = true;
 		SSLi_getSHA1Hash(client->ssl, client->hash);
+		if (Ban_isBanned(client))
+			goto disconnect;
+		
+		client->authenticated = true;
 		
 		client_itr = NULL;
 		while (Client_iterate(&client_itr) != NULL) {
@@ -826,8 +822,7 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		msg->payload.userRemove->actor = client->sessionId;
 
 		if (msg->payload.userRemove->has_ban && msg->payload.userRemove->ban) {
-			Log_info("User banned for %d seconds", getIntConf(BAN_LENGTH));
-			/* Put reason, IP, hash, name etc in a list   --->  msg->payload.userRemove->reason */
+			Ban_UserBan(target, msg->payload.userRemove->reason);
 		} else {
 			Log_info("User kicked");
 		}