summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/cs_ban.c2
-rw-r--r--src/core/os_jupe.c2
-rw-r--r--src/main.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 0d07dd370..b9d6d7520 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -72,7 +72,7 @@ class CommandCSBan : public Command
c->SetMode(NULL, CMODE_BAN, mask);
/* We still allow host banning while not allowing to kick */
- if (c->FindUser(u2))
+ if (!c->FindUser(u2))
return MOD_CONT;
if (ci->HasFlag(CI_SIGNKICK) || (ci->HasFlag(CI_SIGNKICK_LEVEL) && !check_access(u, ci, CA_SIGNKICK)))
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 264572369..3184ec6f4 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -37,7 +37,7 @@ class CommandOSJupe : public Command
snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", u->nick.c_str(), reason ? ": " : "", reason ? reason : "");
if (findserver(servlist, jserver))
ircdproto->SendSquit(jserver, rbuf);
- Server *juped_server = new_server(me_server, jserver, rbuf, SERVER_JUPED, ircd->ts6 ? ts6_sid_retrieve() : NULL);
+ Server *juped_server = new_server(me_server, jserver, rbuf, SERVER_JUPED, ircd->ts6 ? ts6_sid_retrieve() : "");
ircdproto->SendServer(juped_server);
if (Config.WallOSJupe)
diff --git a/src/main.c b/src/main.c
index 41d82234e..801d7fcc1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -200,6 +200,8 @@ void do_restart_services()
if (!quitmsg)
quitmsg = "Restarting";
ircdproto->SendSquit(Config.ServerName, quitmsg);
+ /* Process to send the last bits of information before disconnecting */
+ socketEngine.Process();
delete UplinkSock;
close_log();
/* First don't unload protocol module, then do so */