summaryrefslogtreecommitdiff
path: root/src/auth.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-08-12 11:55:51 +0300
committerPerttu Ahola <celeron55@gmail.com>2011-08-12 11:55:51 +0300
commit7aa72c56b6a3d3af8a7dbef36d3a71fa311a7242 (patch)
tree7d4be0b6e2c2734eacf6a8adcf4d12e8e0966e55 /src/auth.cpp
parent3028bbb95bb7f61bd7756527aaa5513f1e500ccd (diff)
parent5784c14ab798847248e4682ef28434767a549fc6 (diff)
downloadminetest-7aa72c56b6a3d3af8a7dbef36d3a71fa311a7242.tar.gz
minetest-7aa72c56b6a3d3af8a7dbef36d3a71fa311a7242.tar.bz2
minetest-7aa72c56b6a3d3af8a7dbef36d3a71fa311a7242.zip
Merge remote-tracking branch 'speedprog/banByIp'
Diffstat (limited to 'src/auth.cpp')
-rw-r--r--src/auth.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/auth.cpp b/src/auth.cpp
index 5d61243c6..dc740411b 100644
--- a/src/auth.cpp
+++ b/src/auth.cpp
@@ -40,6 +40,8 @@ std::string privsToString(u64 privs)
os<<"privs,";
if(privs & PRIV_SHOUT)
os<<"shout,";
+ if(privs & PRIV_BAN)
+ os<<"ban,";
if(os.tellp())
{
// Drop the trailing comma. (Why on earth can't
@@ -70,6 +72,8 @@ u64 stringToPrivs(std::string str)
privs |= PRIV_PRIVS;
else if(s == "shout")
privs |= PRIV_SHOUT;
+ else if(s == "ban")
+ privs |= PRIV_BAN;
else
return PRIV_INVALID;
}