summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-05-02 20:57:55 +0000
committergeniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-05-02 20:57:55 +0000
commit7a1d87fd7b9d4a471d5971ef8c9d48f9238811fa (patch)
tree8138cc3995dcfc1e9940cf0e808a6887f4f4f27d
parent862291c151ab8ab20e44d9b9f924853951dc5d57 (diff)
BUILD : 1.7.8 (757) BUGS : 355 361 NOTES : FIXED: Seperated +q/+a and +o in chan_set_correct_modes, and used +Z (and not +R) for services roots with ultimate3.
git-svn-id: svn://svn.anope.org/anope/trunk@757 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@519 5417fbe8-f217-4b02-8779-1006273d7864
-rw-r--r--Changes2
-rw-r--r--src/channels.c6
-rw-r--r--src/protocol/ultimate3.c2
-rw-r--r--version.log6
4 files changed, 11 insertions, 5 deletions
diff --git a/Changes b/Changes
index e9307ba47..e6d67c8c1 100644
--- a/Changes
+++ b/Changes
@@ -24,6 +24,8 @@ Provided by Anope Dev. <dev@anope.org> - 2005
02/13 A Internal Event support, see EVENTS in the doc folder for help [ #00]
02/05 A Support for Unreal 3.2 +I channel mode. [ #00]
02/03 A Merged anope-win32 branch into the main, now Win32 ready. [ #00]
+05/02 F Usermode +R instead of +Z used for services roots with Ultimate3. [#361]
+05/02 F Getting op if you had access to protect and not op on a channel. [#355]
05/01 F Typo in include/extern.h with restore_unsynced_topics. [#354]
05/01 F Modes with no arguments where required no longer set with OS mode.[#316]
05/01 F Update win32 documentation and files so it works again. [ #00]
diff --git a/src/channels.c b/src/channels.c
index 86a42e118..e881b21ba 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1301,11 +1301,11 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
&&
(((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
|| (!(ci->flags & CI_SECUREFOUNDER) && is_founder(user, ci))))
- add_modes |= (CUS_OWNER | CUS_OP);
+ add_modes |= CUS_OWNER;
else if ((ircd->protect || ircd->admin)
&& check_access(user, ci, CA_AUTOPROTECT))
- add_modes |= (CUS_PROTECT | CUS_OP);
- else if (check_access(user, ci, CA_AUTOOP))
+ add_modes |= CUS_PROTECT;
+ if (check_access(user, ci, CA_AUTOOP))
add_modes |= CUS_OP;
else if (ircd->halfop && check_access(user, ci, CA_AUTOHALFOP))
add_modes |= CUS_HALFOP;
diff --git a/src/protocol/ultimate3.c b/src/protocol/ultimate3.c
index dedfb9077..cf6bee431 100644
--- a/src/protocol/ultimate3.c
+++ b/src/protocol/ultimate3.c
@@ -211,7 +211,7 @@ void ultimate3_set_umode(User * user, int ac, char **av)
}
if (is_services_root(user)) {
common_svsmode(user, "+Z", NULL);
- user->mode |= UMODE_R;
+ user->mode |= UMODE_Z;
}
} else {
opcnt--;
diff --git a/version.log b/version.log
index 78028846d..de556a2eb 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
-VERSION_BUILD="756"
+VERSION_BUILD="757"
# $Log$
#
+# BUILD : 1.7.8 (757)
+# BUGS : 355 361
+# NOTES : FIXED: Seperated +q/+a and +o in chan_set_correct_modes, and used +Z (and not +R) for services roots with ultimate3.
+#
# BUILD : 1.7.8 (756)
# BUGS : N/A
# NOTES : Turnend -x off