allow IRC Ops unregister protected channels (nodelete override)

[srvx.git] / src / proto-common.c

diff --git a/src/proto-common.c b/src/proto-common.c
index 324058f28998a5cc23811f1294cb418dbffc3cb9..e690726116d06cbe36b2d30ef9da9fc223fb5fea 100644 (file)
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -24,6 +24,7 @@
 #include "log.h"
 #include "nickserv.h"
 #include "opserv.h"
+#include "chanserv.h"
 #include "spamserv.h"
 #include "timeq.h"
 #ifdef HAVE_SYS_SOCKET_H
@@ -482,6 +483,8 @@ part_helper(struct chanNode *cn, void *data)
 {
     struct part_desc *desc = data;
     DelChannelUser(desc->user, cn, desc->text, false);
+    if (IsOper(desc->user))
+        operpart(cn, desc->user);
 }
 
 static CMD_FUNC(cmd_part)
@@ -602,6 +605,7 @@ mod_chanmode_dup(struct mod_chanmode *orig, unsigned int extra)
         res->new_limit = orig->new_limit;
         res->new_access = orig->new_access;
         memcpy(res->new_altchan, orig->new_altchan, sizeof(res->new_altchan));
+        memcpy(res->new_noflood, orig->new_noflood, sizeof(res->new_noflood));
         memcpy(res->new_key, orig->new_key, sizeof(res->new_key));
         memcpy(res->new_upass, orig->new_upass, sizeof(res->new_upass));
         memcpy(res->new_apass, orig->new_apass, sizeof(res->new_apass));
@@ -627,6 +631,8 @@ mod_chanmode_apply(struct userNode *who, struct chanNode *channel, struct mod_ch
         strcpy(channel->key, change->new_key);
     if (change->modes_set & MODE_ALTCHAN)
         strcpy(channel->altchan, change->new_altchan);
+    if (change->modes_set & MODE_NOFLOOD)
+        strcpy(channel->noflood, change->new_noflood);
     if (change->modes_set & MODE_UPASS)
        strcpy(channel->upass, change->new_upass);
     if (change->modes_set & MODE_APASS)
@@ -703,7 +709,7 @@ mod_chanmode(struct userNode *who, struct chanNode *channel, char **modes, unsig
         base_oplevel = member->oplevel;
     else
         base_oplevel = MAXOPLEVEL;
-    if (!(change = mod_chanmode_parse(channel, modes, argc, flags, base_oplevel)))
+    if (!(change = mod_chanmode_parse(channel, who, modes, argc, flags, base_oplevel)))
         return 0;
     if (flags & MC_ANNOUNCE)
         mod_chanmode_announce(who, channel, change);
@@ -725,6 +731,7 @@ irc_make_chanmode(struct chanNode *chan, char *out)
     change.new_limit = chan->limit;
     change.new_access = chan->access;
     safestrncpy(change.new_altchan, chan->altchan, sizeof(change.new_altchan));
+    safestrncpy(change.new_noflood, chan->noflood, sizeof(change.new_noflood));
     safestrncpy(change.new_key, chan->key, sizeof(change.new_key));
     safestrncpy(change.new_upass, chan->upass, sizeof(change.new_upass));
     safestrncpy(change.new_apass, chan->apass, sizeof(change.new_apass));
@@ -758,7 +765,7 @@ generate_hostmask(struct userNode *user, int options)
     }
     hostname = user->hostname;
     if (IsFakeHost(user) && IsHiddenHost(user) && !(options & GENMASK_NO_HIDING)) {
-        if(user->fakehost && user->fakehost[0] == "$") {
+        if(user->fakehost && user->fakehost[0] == '$') {
             hostname = alloca(strlen(user->handle_info->handle) + strlen(user->fakehost));
             sprintf(hostname, "%s%s", user->handle_info->handle, user->fakehost+1);
         } else {