quick fix for "Unable to find user SOME-SERVER whose mark is changing." errors, bette...

diff --git a/ChangeLog b/ChangeLog
index 139262eacc8e489dea54fe3abadcad43ce8404eb..618fca228258e3d9b0736c5a67e05f4161edee86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 /***********************************************************************
 X3 ChangeLog
 
+2007-06-06  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * src/proto-p10.c: Quick fix (as its 12:11am and i have work at 8:30am).
+       This will stop the "Unable to find user irc.servername.com whose mark 
+       is changing." messages. When a user reconnects and an existing exempt
+       is on the network for the user, their lastseen time is sent out to
+       all the servers. This quick fix moves the user checking part to
+       the relevant part of the function that actually uses users.
+
 2007-05-04  Alex Schumann  <rubin@afternet.org>
 
         * src/chanserv.c: fixed problem with giveownership logs where the

diff --git a/src/proto-p10.c b/src/proto-p10.c
index f55dd7e0960ea04d1abfaf7d87dc1a623b7a422a..fea9242fc9c72b898be58f4fd10caa0383c4f6e2 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -1770,17 +1770,17 @@ static CMD_FUNC(cmd_mark)
 
     if(argc < 4)
         return 0;
-    target = GetUserH(argv[1]);
-    if(!target) {
-        log_module(MAIN_LOG, LOG_ERROR, "Unable to find user %s whose mark is changing.", argv[1]);
-        return 0;
-    }
     if(!strcasecmp(argv[2], "DNSBL")) {
         /* DNSBL <modes> */
         return 1;
     }
     else if(!strcasecmp(argv[2], "DNSBL_DATA")) {
         /* DNSBL_DATA name */
+        target = GetUserH(argv[1]);
+        if(!target) {
+            log_module(MAIN_LOG, LOG_ERROR, "Unable to find user %s whose mark is changing.", argv[1]);
+            return 0;
+        }
         target->mark = strdup(argv[3]);
         return 1;