diff options
| -rw-r--r-- | src/channels.c | 5 | ||||
| -rw-r--r-- | version.log | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/channels.c b/src/channels.c index 87e6a8d05..297c8b8ec 100644 --- a/src/channels.c +++ b/src/channels.c @@ -533,6 +533,7 @@ void do_join(const char *source, int ac, char **av) char *s, *t; struct u_chanlist *c, *nextc; char *channame; + time_t ts = time(NULL); if (UseTS6 && ircd->ts6) { user = find_byuid(source); @@ -580,11 +581,9 @@ void do_join(const char *source, int ac, char **av) * don't get to see things like channel keys. */ /* If channel already exists, check_kick() will use correct TS. * Otherwise, we lose. */ - if (check_kick(user, s, time(NULL))) + if (check_kick(user, s, ts)) continue; - time_t ts = time(NULL); - if (ac == 2) { if (debug) { alog("debug: recieved a new TS for JOIN: %ld", diff --git a/version.log b/version.log index f165aee47..e5f8077c8 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,15 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="21" VERSION_EXTRA="-svn" -VERSION_BUILD="1421" +VERSION_BUILD="1422" # $Log$ # +# BUILD : 1.7.21 (1422) +# BUGS : 927 +# NOTES : Fixes compiling on windows. We should define new variables +# above the code not in between. +# # # BUILD : 1.7.21 (1421) # BUGS : 879 |