summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core/ns_logout.c2
-rw-r--r--src/protocol/inspircd12.c2
-rw-r--r--version.log3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index 09a594913..eaa04220e 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -102,7 +102,7 @@ int do_logout(User * u)
common_svsmode(u2, ircd->modeonunreg, "1");
}
- u->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */
+ u2->isSuperAdmin = 0; /* Dont let people logout and remain a SuperAdmin */
alog("%s: %s!%s@%s logged out nickname %s", s_NickServ, u->nick,
u->username, u->host, u2->nick);
diff --git a/src/protocol/inspircd12.c b/src/protocol/inspircd12.c
index b6a92231a..e5722c236 100644
--- a/src/protocol/inspircd12.c
+++ b/src/protocol/inspircd12.c
@@ -614,7 +614,7 @@ void inspircd_cmd_svsmode(User * u, int ac, char **av)
Uid *ud = find_uid(s_NickServ);
send_cmd(ud->uid, "MODE %s %s", u->nick, merge_args(ac, av));
- if (strstr(av[0], "+r")) {
+ if (strstr(av[0], "+r") && u->na) {
send_cmd(TS6SID, "METADATA %s accountname :%s", u->uid, u->na->nc->display);
} else if (strstr(av[0], "-r")) {
send_cmd(TS6SID, "METADATA %s accountname :", u->uid);
diff --git a/version.log b/version.log
index 51d25ca07..42a44349b 100644
--- a/version.log
+++ b/version.log
@@ -8,9 +8,10 @@ VERSION_MAJOR="1"
VERSION_MINOR="8"
VERSION_PATCH="4"
VERSION_EXTRA="-git"
-VERSION_BUILD="3016"
+VERSION_BUILD="3017"
# $Log$ # Changes since the 1.8.4 Release
+#Revision 3017 - Log out super admins when someone forces them to logout
#Revision 3016 - Fixed a potential crash from receiving a very long FMODE from InspIRCd
#Revision 3015 - Allow clearing of access lists while in XOP mode
#Revision 3014 - Increased command buffer size. Insp 2.0 has a bigger appetite it seems..