summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes3
-rw-r--r--src/channels.c6
-rw-r--r--src/nickserv.c4
-rw-r--r--version.log6
4 files changed, 11 insertions, 8 deletions
diff --git a/Changes b/Changes
index 98c48e0fb..4c4b637b5 100644
--- a/Changes
+++ b/Changes
@@ -10,9 +10,10 @@ 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]
+04/12 F Users channel modes are correctly set on join. [#342]
+04/11 F Make sure nick isn't in use on nickserv collide. [#341]
04/07 F Added channel names to XOP/ACCESS/AKICK CLEAR [#346]
04/07 F Only users with vHost/vIdent can /hostserv off [#351]
-04/07 F Make sure nick isn't in use on nickserv collide [#341]
04/01 F Sync state for leaf-servers not updated correctly. [ #00]
03/30 F ChanServ now sets topic again when channel is re-created. [#339]
03/29 F Changed anoperc script to use kill numerics for compliance. [ #00]
diff --git a/src/channels.c b/src/channels.c
index bd7477da8..d80a62f4a 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1240,9 +1240,6 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
if ((ci->flags & CI_VERBOTEN) || (*(c->name) == '+'))
return;
- if ((ci->flags & CI_SECURE) && !nick_identified(user))
- return;
-
status = chan_get_user_status(c, user);
if (debug >= 2)
@@ -1268,8 +1265,9 @@ void chan_set_correct_modes(User * user, Channel * c, int give_modes)
/* We check if every mode they have is legally acquired here, and remove
* the modes that they're not allowed to have. But only if SECUREOPS is
* on, because else every mode is legal. -GD
+ * Unless the channel has just been created. -heinz
*/
- if (ci->flags & CI_SECUREOPS) {
+ if ((ci->flags & CI_SECUREOPS) || c->usercount == 1) {
if (ircd->owner && (status & CUS_OWNER)
&&
!(((ci->flags & CI_SECUREFOUNDER) && is_real_founder(user, ci))
diff --git a/src/nickserv.c b/src/nickserv.c
index 586362c9e..76dfcf21f 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1763,8 +1763,8 @@ static void collide(NickAlias * na, int from_timeout)
if (ircd->svsnick) {
/* We need to make sure the guestnick is free -- heinz */
do {
- snprintf(guestnick, sizeof(guestnick), "%s%d%d",
- NSGuestNickPrefix, getrandom32(), getrandom32());
+ snprintf(guestnick, sizeof(guestnick), "%s%d",
+ NSGuestNickPrefix, getrandom16());
} while (finduser(guestnick));
notice_lang(s_NickServ, na->u, FORCENICKCHANGE_CHANGING,
guestnick);
diff --git a/version.log b/version.log
index 30421dce5..6248b89d9 100644
--- a/version.log
+++ b/version.log
@@ -8,10 +8,14 @@
VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="8"
-VERSION_BUILD="660"
+VERSION_BUILD="661"
# $Log$
#
+# BUILD : 1.7.8 (661)
+# BUGS : 341 342
+# NOTES : Fixed removing modes when users with insufficient rights entered a channel, and added a check to make sure the guestnick is not in use yet
+#
# BUILD : 1.7.8 (660)
# BUGS :
# NOTES : Added .BANNER file for the Config script