X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/3cb05e5640b4a5dd4e8d078aff0fc1dbae87544c..dad344a7fea8306caf0a3581daf4beb2117ec43b:/request/request_fasttrack.c

diff --git a/request/request_fasttrack.c b/request/request_fasttrack.c
index 2663c9dc..a49a1475 100644
--- a/request/request_fasttrack.c
+++ b/request/request_fasttrack.c
@@ -54,6 +54,8 @@ static void rqhook_account(int hook, void *arg) {
   nick *np = (nick *)arg;
   rq_fasttrack *ft;
 
+  np->exts[rqnext] = NULL;
+
   /* Auth might be null for the newnick hook. */
   if(!np->auth)
     return;
@@ -68,18 +70,18 @@ static void rqhook_account(int hook, void *arg) {
 }
 
 static void rq_cleanup_fasttrack(void *arg) {
-  time_t now = getnettime();
+  time_t now;
   rq_fasttrack **pft, *ft;
   int j;
   nick *tnp;
 
   now = getnettime();
 
-  pft = &ftlist;
-
-  for(ft=*pft;*pft;pft=&((*pft)->next)) {
+  for(pft=&ftlist;*pft;pft=&((*pft)->next)) {
     int foundnick = 0;
 
+    ft = *pft;
+
     for(j=0;j<NICKHASHSIZE && !foundnick;j++) {
       for(tnp=nicktable[j];tnp;tnp=tnp->next) {
         if(tnp->exts[rqnext]==ft) {