summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes1
-rw-r--r--src/protocol/inspircd11.c10
-rw-r--r--version.log6
3 files changed, 14 insertions, 3 deletions
diff --git a/Changes b/Changes
index aa791da8b..6e8cace7e 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,7 @@ Anope Version S V N
--------------------
12/30 F Grouped root nicks could result in loss of power when using MySQL.[#812]
01/01 F Databases not being saved on quit caused by connection error. [#811]
+01/05 F Re-idenficiation after netsplit on InspIRCd. [#817]
Provided by Trystan <trystan@nomadirc.net> - 2008
01/04 F Detection of Windows Vista and Windows Server 2008. [#815]
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index 0e35986e0..664eb9204 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -443,6 +443,7 @@ void inspircd_set_umode(User * user, int ac, char **av)
}
break;
case 'r':
+ user->svid = (add ? user->timestamp : 0);
if (add && !nick_identified(user)) {
common_svsmode(user, "-r", NULL);
user->mode &= ~UMODE_r;
@@ -1454,14 +1455,19 @@ int anope_event_nick(char *source, int ac, char **av)
if (ac != 1) {
if (ac == 8) {
+ int svid = 0;
+ int ts = strtoul(av[0], NULL, 10);
+
+ if (strchr(av[5], 'r') != NULL)
+ svid = ts;
+
inet_aton(av[6], &addy);
user = do_nick("", av[1], /* nick */
av[4], /* username */
av[2], /* realhost */
source, /* server */
av[7], /* realname */
- strtoul(av[0], NULL, 10),
- 0, htonl(*ad), av[3], NULL);
+ ts, svid, htonl(*ad), av[3], NULL);
if (user)
anope_set_umode(user, 1, &av[5]);
}
diff --git a/version.log b/version.log
index 6a593a91c..d7f81b7cf 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="20"
VERSION_EXTRA="-svn"
-VERSION_BUILD="1332"
+VERSION_BUILD="1333"
# $Log$
#
+# BUILD : 1.7.20 (1333)
+# BUGS : 817
+# NOTES : Fixed users not being re-identified automatically after a netsplit on insp
+#
# BUILD : 1.7.20 (1332)
# BUGS :
# NOTES : Updated Russian language file provided by Kein and added his Russian translations to bundled modules as well