summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/core/os_oper.c4
-rw-r--r--version.log6
3 files changed, 10 insertions, 1 deletions
diff --git a/Changes b/Changes
index ce92bba38..67632002a 100644
--- a/Changes
+++ b/Changes
@@ -13,6 +13,7 @@ Anope Version S V N
01/15 F Only send PONG during MySQL save when we're not syncing. [#669]
01/15 F InspIRCD 1.1 protocol module used windows incompatible strtok_r. [#667]
01/22 F Crash during first save when MySQL is enabled. [#672]
+03/03 F SAs can no longer move other SAs down to ServicesOpers. [#690]
Anope Version 1.7.18
--------------------
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 419dbb7c6..a0f71f5ff 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -111,6 +111,10 @@ int do_oper(User * u)
} else {
if (na->nc->flags & NI_SERVICES_ADMIN
&& (res = slist_indexof(&servadmins, na->nc)) != -1) {
+ if (!is_services_root(u)) {
+ notice_lang(s_OperServ, u, PERMISSION_DENIED);
+ return MOD_CONT;
+ }
slist_delete(&servadmins, res);
na->nc->flags |= NI_SERVICES_OPER;
notice_lang(s_OperServ, u, OPER_OPER_MOVED, nick);
diff --git a/version.log b/version.log
index 86f14fa38..0194b351e 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="18"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1228"
+VERSION_BUILD="1229"
# $Log$
#
+# BUILD : 1.7.18 (1229)
+# BUGS : 690
+# NOTES : SAs can no longer move down other SAs to the SO list.
+#
# BUILD : 1.7.18 (1228)
# BUGS : 672
# NOTES : Fixed a crash when MySQL was enabled; it checked the (unset) uplink server flags resulting in a segfault