Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[user/henk/code/inspircd.git] / src / modules / extra / m_geo_maxmind.cpp

diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp
index b7639c287347ef492802d1477e5504e5b0871580..767d0011469c6d4fbff6c7c8656fc8c37a13f545 100644 (file)
--- a/src/modules/extra/m_geo_maxmind.cpp
+++ b/src/modules/extra/m_geo_maxmind.cpp
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/// $CompilerFlags: find_compiler_flags("libmaxminddb")
-/// $LinkerFlags: find_linker_flags("libmaxminddb")
+/// $CompilerFlags: find_compiler_flags("libmaxminddb" "")
+/// $LinkerFlags: find_linker_flags("libmaxminddb" "-lmaxminddb")
 
+/// $PackageInfo: require_system("arch") libmaxminddb pkgconf
 /// $PackageInfo: require_system("darwin") libmaxminddb pkg-config
 /// $PackageInfo: require_system("debian" "9.0") libmaxminddb-dev pkg-config
 /// $PackageInfo: require_system("ubuntu" "16.04") libmaxminddb-dev pkg-config
@@ -27,9 +28,9 @@
 # pragma comment(lib, "libmaxminddb.lib")
 #endif
 
-#include <maxminddb.h>
 #include "inspircd.h"
 #include "modules/geolocation.h"
+#include <maxminddb.h>
 
 class GeolocationExtItem : public LocalExtItem
 {
@@ -97,6 +98,10 @@ class GeolocationAPIImpl : public Geolocation::APIBase
 
        Geolocation::Location* GetLocation(irc::sockets::sockaddrs& sa) CXX11_OVERRIDE
        {
+               // Skip trying to look up a UNIX socket.
+               if (sa.family() != AF_INET && sa.family() != AF_INET6)
+                       return NULL;
+
                // Attempt to look up the socket address.
                int result;
                MMDB_lookup_result_s lookup = MMDB_lookup_sockaddr(&mmdb, &sa.sa, &result);