From 8bba9cde5c2536812679855e145954929a054d48 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 16 May 2011 18:26:37 +0100 Subject: [PATCH 1/2] Restored the auto-admin powers of the local user (via name= in the config) --HG-- extra : rebase_source : a35aa0d978990c28fa4fc158ce47d1f4aa967c04 --- src/server.cpp | 10 ++++++++-- src/servercommand.cpp | 16 +++++++++------- src/servercommand.h | 8 ++++++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index 6c57daa5..d211186e 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2870,12 +2870,18 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) message = message.substr(commandprefix.size()); + // Local player gets all privileges regardless of + // what's set on their account. + u64 privs = player->privs; + if(g_settings.get("name") == player->getName()) + privs = PRIV_ALL; + ServerCommandContext *ctx = new ServerCommandContext( str_split(message, L' '), this, &m_env, - player - ); + player, + privs); line += processServerCommand(ctx); send_to_sender = ctx->flags & 1; diff --git a/src/servercommand.cpp b/src/servercommand.cpp index 215dc0d2..5bb4f67f 100644 --- a/src/servercommand.cpp +++ b/src/servercommand.cpp @@ -33,11 +33,13 @@ void cmd_privs(std::wostringstream &os, { if(ctx->parms.size() == 1) { + // Show our own real privs, without any adjustments + // made for admin status os<player->privs); return; } - if((ctx->player->privs & PRIV_PRIVS) == 0) + if((ctx->privs & PRIV_PRIVS) == 0) { os<player->privs & PRIV_PRIVS) == 0) + if((ctx->privs & PRIV_PRIVS) == 0) { os<player->privs & PRIV_SETTIME) ==0) + if((ctx->privs & PRIV_SETTIME) ==0) { os<player->privs & PRIV_SERVER) ==0) + if((ctx->privs & PRIV_SERVER) ==0) { os<player->privs & PRIV_SERVER) ==0) + if((ctx->privs & PRIV_SERVER) ==0) { os<player->privs & PRIV_TELEPORT) ==0) + if((ctx->privs & PRIV_TELEPORT) ==0) { os<flags = 1; // Default, unless we change it. - u64 privs = ctx->player->privs; + u64 privs = ctx->privs; if(ctx->parms.size() == 0 || ctx->parms[0] == L"help") { diff --git a/src/servercommand.h b/src/servercommand.h index bc7823c6..058fbe65 100644 --- a/src/servercommand.h +++ b/src/servercommand.h @@ -34,14 +34,18 @@ struct ServerCommandContext Server* server; ServerEnvironment *env; Player* player; + // Effective privs for the player, which may be different to their + // stored ones - e.g. if they are named in the config as an admin. + u64 privs; u32 flags; ServerCommandContext( std::vector parms, Server* server, ServerEnvironment *env, - Player* player) - : parms(parms), server(server), env(env), player(player) + Player* player, + u64 privs) + : parms(parms), server(server), env(env), player(player), privs(privs) { } From 29932d4bddad6a0ad4269606e38701d544784951 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 16 May 2011 21:47:50 +0100 Subject: [PATCH 2/2] Get rid of all the string format warnings caused by the DSTACK macro --- src/debug.h | 5 ++++- src/map.cpp | 8 ++++---- src/mapblockobject.cpp | 10 +++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/debug.h b/src/debug.h index 5cc1e6c4..234b7c74 100644 --- a/src/debug.h +++ b/src/debug.h @@ -169,7 +169,10 @@ private: bool m_overflowed; }; -#define DSTACK(...)\ +#define DSTACK(msg)\ + DebugStacker __debug_stacker(msg); + +#define DSTACKF(...)\ char __buf[DEBUG_STACK_TEXT_SIZE];\ snprintf(__buf,\ DEBUG_STACK_TEXT_SIZE, __VA_ARGS__);\ diff --git a/src/map.cpp b/src/map.cpp index 02614e1a..63f01dde 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -3830,7 +3830,7 @@ MapChunk* ServerMap::generateChunk(v2s16 chunkpos1, ServerMapSector * ServerMap::createSector(v2s16 p2d) { - DSTACK("%s: p2d=(%d,%d)", + DSTACKF("%s: p2d=(%d,%d)", __FUNCTION_NAME, p2d.X, p2d.Y); @@ -3982,7 +3982,7 @@ MapBlock * ServerMap::generateBlock( core::map &lighting_invalidated_blocks ) { - DSTACK("%s: p=(%d,%d,%d)", + DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z); @@ -4618,7 +4618,7 @@ continue_generating: MapBlock * ServerMap::createBlock(v3s16 p) { - DSTACK("%s: p=(%d,%d,%d)", + DSTACKF("%s: p=(%d,%d,%d)", __FUNCTION_NAME, p.X, p.Y, p.Z); /* @@ -4682,7 +4682,7 @@ MapBlock * ServerMap::emergeBlock( core::map &lighting_invalidated_blocks ) { - DSTACK("%s: p=(%d,%d,%d), only_from_disk=%d", + DSTACKF("%s: p=(%d,%d,%d), only_from_disk=%d", __FUNCTION_NAME, p.X, p.Y, p.Z, only_from_disk); diff --git a/src/mapblockobject.cpp b/src/mapblockobject.cpp index 343926f8..d05eee80 100644 --- a/src/mapblockobject.cpp +++ b/src/mapblockobject.cpp @@ -63,7 +63,7 @@ v3f MovingObject::getAbsoluteShowPos() void MovingObject::move(float dtime, v3f acceleration) { - DSTACK("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)" + DSTACKF("%s: typeid=%i, pos=(%f,%f,%f), speed=(%f,%f,%f)" ", dtime=%f, acc=(%f,%f,%f)", __FUNCTION_NAME, getTypeId(), @@ -755,7 +755,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) core::map ids_to_delete; { - DSTACK("%s: stepping objects", __FUNCTION_NAME); + DSTACKF("%s: stepping objects", __FUNCTION_NAME); for(core::map::Iterator i = m_objects.getIterator(); @@ -763,7 +763,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) { MapBlockObject *obj = i.getNode()->getValue(); - DSTACK("%s: stepping object type %i", __FUNCTION_NAME, + DSTACKF("%s: stepping object type %i", __FUNCTION_NAME, obj->getTypeId()); if(server) @@ -791,7 +791,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) } { - DSTACK("%s: deleting objects", __FUNCTION_NAME); + DSTACKF("%s: deleting objects", __FUNCTION_NAME); // Delete objects in delete queue for(core::map::Iterator @@ -815,7 +815,7 @@ void MapBlockObjectList::step(float dtime, bool server, u32 daynight_ratio) return; { - DSTACK("%s: object wrap loop", __FUNCTION_NAME); + DSTACKF("%s: object wrap loop", __FUNCTION_NAME); for(core::map::Iterator i = m_objects.getIterator();