Backout changeset 76f3a755c6548690f69f2256c8b83c7a0f0f9a95.

src/security.c

@@ -197,15 +197,7 @@ int mosquitto_acl_check(struct mosquitto_db *db, struct mosquitto *context, cons
 	if(!db->auth_plugin.lib){
 		return mosquitto_acl_check_default(db, context, topic, access);
 	}else{
-#ifdef WITH_BRIDGE
-		if(context->bridge){
-			return db->auth_plugin.acl_check(db->auth_plugin.user_data, context->id, context->bridge->local_username, topic, access);
-		}else{
-#endif
-			return db->auth_plugin.acl_check(db->auth_plugin.user_data, context->id, context->username, topic, access);
-#ifdef WITH_BRIDGE
-		}
-#endif
+		return db->auth_plugin.acl_check(db->auth_plugin.user_data, context->id, context->username, topic, access);
 	}
 }