X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=5a2269c4cfc27f9affdd125b151ed740f5ac4ace;hb=25b7d7ee7e1979bf244fa663b56f68c8b00f51b1;hp=f8858c96c35e5e1f1d7ecfbf74d23070e5e69fd4;hpb=5b8dc3fd052b892f75f167af91193e88e321f42c;p=umurmur.git

diff --git a/src/messagehandler.c b/src/messagehandler.c
index f8858c9..5a2269c 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -512,6 +512,8 @@ void Mh_handle_message(client_t *client, message_t *msg)
 		break;
 		
 	case TextMessage:
+		if (!getBoolConf(ALLOW_TEXTMESSAGE))
+			break;
 		msg->payload.textMessage->has_actor = true;
 		msg->payload.textMessage->actor = client->sessionId;
 
@@ -617,11 +619,15 @@ void Mh_handle_message(client_t *client, message_t *msg)
 	case PermissionQuery:
 		Msg_inc_ref(msg); /* Re-use message */
 		msg->payload.permissionQuery->has_permissions = true;
+		
 		if (client->isAdmin)
 			msg->payload.permissionQuery->permissions = PERM_ADMIN;
 		else
 			msg->payload.permissionQuery->permissions = PERM_DEFAULT;
 		
+		if (!getBoolConf(ALLOW_TEXTMESSAGE))
+			msg->payload.permissionQuery->permissions &= ~PERM_TEXTMESSAGE;
+		
 		Client_send_message(client, msg);
 		break;
 	case UDPTunnel: