Added some bits from check_ctcp into the mark version handling

[irc/evilnet/x3.git] / src / hash.c

diff --git a/src/hash.c b/src/hash.c
index ad63f3ccce2a83108db0d8cd99ea122f3718d049..214d6b9c2941ec3f264f8b0160e610bf02fb826f 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -5,7 +5,7 @@
  *
  * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -257,6 +257,8 @@ assign_fakehost(struct userNode *user, const char *host, int announce)
 void
 set_geoip_info(struct userNode *user)
 {
+    if(IsLocal(user))
+        return;
 /* Need the libs and the headers if this is going to compile properly */
 #if defined(HAVE_LIBGEOIP)&&defined(HAVE_GEOIP_H)&&defined(HAVE_GEOIPCITY_H)
     GeoIPRecord * gir;
@@ -266,7 +268,7 @@ set_geoip_info(struct userNode *user)
     geoip_data_file = conf_get_data("services/opserv/geoip_data_file", RECDB_QSTRING);
     geoip_city_file = conf_get_data("services/opserv/geoip_city_data_file", RECDB_QSTRING);
 
-    if ((!geoip_data_file && !geoip_city_file) || IsLocal(user))
+    if ((!geoip_data_file && !geoip_city_file))
         return; /* Admin doesnt want to use geoip functions */
 
     if (geoip_data_file && !gi)
@@ -711,7 +713,7 @@ ChannelUserKicked(struct userNode* kicker, struct userNode* victim, struct chanN
     unsigned int n;
     struct modeNode *mn;
 
-    if (!victim || !channel || IsService(victim) || !GetUserMode(channel, victim))
+    if (!victim || !channel || !GetUserMode(channel, victim))
         return;
 
     /* Update the kicker's idle time (kicker may be null if it was a server) */