aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/servercommand.cpp2
-rw-r--r--src/socket.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/servercommand.cpp b/src/servercommand.cpp
index bf174497d..663693b9a 100644
--- a/src/servercommand.cpp
+++ b/src/servercommand.cpp
@@ -185,7 +185,7 @@ void cmd_teleport(std::wostringstream &os,
void cmd_banunban(std::wostringstream &os, ServerCommandContext *ctx)
{
- if((ctx->privs && PRIV_BAN) == 0)
+ if((ctx->privs & PRIV_BAN) == 0)
{
os<<L"-!- You don't have permission to do that";
return;
diff --git a/src/socket.cpp b/src/socket.cpp
index a7d204047..ac4871f61 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -100,10 +100,10 @@ void Address::Resolve(const char *name)
std::string Address::serializeString()
{
unsigned int a, b, c, d;
- a = (m_address && 0xFF000000)>>24;
- b = (m_address && 0x00FF0000)>>16;
- c = (m_address && 0x0000FF00)>>8;
- d = (m_address && 0x000000FF);
+ a = (m_address & 0xFF000000)>>24;
+ b = (m_address & 0x00FF0000)>>16;
+ c = (m_address & 0x0000FF00)>>8;
+ d = (m_address & 0x000000FF);
return itos(a)+"."+itos(b)+"."+itos(c)+"."+itos(d);
}