From 889bcd99dcb78ff64a96da4305fa078f852bbc37 Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Sun, 1 May 2022 14:11:24 +0200
Subject: [PATCH] Actually build and load module for unrealircd.org/geoip-tag
 by default.

---
 Makefile.windows              | 4 ++++
 doc/conf/modules.default.conf | 5 +++--
 src/modules/Makefile.in       | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.windows b/Makefile.windows
index 69ec930e2..9d3ab6e01 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -278,6 +278,7 @@ DLL_FILES=\
  src/modules/geoip_base.dll \
  src/modules/geoip_classic.dll \
  src/modules/geoip_csv.dll \
+ src/modules/geoip-tag.dll \
  src/modules/globops.dll \
  src/modules/help.dll \
  src/modules/hideserver.dll \
@@ -900,6 +901,9 @@ src/modules/geoip_classic.dll: src/modules/geoip_classic.c $(INCLUDES)
 src/modules/geoip_csv.dll: src/modules/geoip_csv.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/geoip_csv.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip_csv.pdb $(MODLFLAGS)
 
+src/modules/geoip-tag.dll: src/modules/geoip-tag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/geoip-tag.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip-tag.pdb $(MODLFLAGS)
+
 src/modules/geoip_maxmind.dll: src/modules/geoip_maxmind.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/geoip_maxmind.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip_maxmind.pdb $(MODLFLAGS)
 
diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf
index 74bcf0c3a..0b6b97d28 100644
--- a/doc/conf/modules.default.conf
+++ b/doc/conf/modules.default.conf
@@ -245,8 +245,9 @@ loadmodule "rmtkl"; /* Easily remove *-Lines in bulk with /RMTKL */
 loadmodule "restrict-commands"; /* Provides set::restrict-commands settings */
 loadmodule "reputation"; /* used by Connthrottle and others, see next */
 loadmodule "connthrottle"; /* see https://www.unrealircd.org/docs/Connthrottle */
-loadmodule "userip-tag"; /* unrealircd.org/userip tag for ircops */
-loadmodule "userhost-tag"; /* unrealircd.org/userhost tag for ircops */
+loadmodule "userip-tag"; /* unrealircd.org/userip tag for ircops (IP address) */
+loadmodule "userhost-tag"; /* unrealircd.org/userhost tag for ircops (real host) */
+loadmodule "geoip-tag"; /* unrealircd.org/geoip tag for ircops (country) */
 loadmodule "json-log-tag"; /* unrealircd.org/json-log tag and CAP for ircops */
 loadmodule "targetfloodprot"; /* set::anti-flood::target-flood protection */
 loadmodule "watch-backend"; /* used by watch and other modules */
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 62ee8989e..739fe3edd 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -71,7 +71,7 @@ MODULES= \
 	message-tags.so batch.so \
 	account-tag.so labeled-response.so link-security.so \
 	message-ids.so plaintext-policy.so server-time.so sts.so \
-	echo-message.so userip-tag.so userhost-tag.so \
+	echo-message.so userip-tag.so userhost-tag.so geoip-tag.so \
 	bot-tag.so reply-tag.so json-log-tag.so \
 	typing-indicator.so \
 	ident_lookup.so history.so chathistory.so \