summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/svn-rev.sh2
-rw-r--r--src/users.cpp10
2 files changed, 5 insertions, 7 deletions
diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index ec010b6a2..5c5377de5 100755
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3409
+echo 3411
diff --git a/src/users.cpp b/src/users.cpp
index 44f6d0cc6..d6e44c494 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -201,13 +201,11 @@ bool userrec::HasPermission(std::string &command)
char* savept;
char* savept2;
- // users on u-lined servers can completely bypass
+ // users on remote servers can completely bypass
// all permissions based checks.
- //
- // of course, if this is sent to a remote server and this
- // server is not ulined there, then that other server
- // silently drops the command.
- if (is_uline(this->server))
+ // This prevents desyncs when one server has different
+ // type/class tags to another.
+ if (!IS_LOCAL(this))
return true;
// are they even an oper at all?