From dc73bd3a2d4e6eb643733941736791c62accefdc Mon Sep 17 00:00:00 2001
From: Bram Matthys <syzop@vulnscan.org>
Date: Tue, 11 Nov 2003 20:20:23 +0000
Subject: [PATCH] - Made win32 work again (broke it by /module patch 35 minutes
 ago).

---
 Changes                    | 1 +
 include/struct.h           | 2 ++
 src/modules/l_commands.c   | 2 +-
 src/modules/m_adminchat.c  | 2 +-
 src/modules/m_akill.c      | 2 +-
 src/modules/m_away.c       | 2 +-
 src/modules/m_chghost.c    | 2 +-
 src/modules/m_chgident.c   | 2 +-
 src/modules/m_chgname.c    | 2 +-
 src/modules/m_cycle.c      | 2 +-
 src/modules/m_guest.c      | 2 +-
 src/modules/m_htm.c        | 2 +-
 src/modules/m_kill.c       | 2 +-
 src/modules/m_lag.c        | 2 +-
 src/modules/m_message.c    | 2 +-
 src/modules/m_mkpasswd.c   | 2 +-
 src/modules/m_nachat.c     | 2 +-
 src/modules/m_oper.c       | 2 +-
 src/modules/m_pingpong.c   | 2 +-
 src/modules/m_quit.c       | 2 +-
 src/modules/m_rakill.c     | 2 +-
 src/modules/m_rping.c      | 2 +-
 src/modules/m_sdesc.c      | 2 +-
 src/modules/m_sendumode.c  | 2 +-
 src/modules/m_sethost.c    | 2 +-
 src/modules/m_setident.c   | 2 +-
 src/modules/m_setname.c    | 2 +-
 src/modules/m_sqline.c     | 2 +-
 src/modules/m_svsjoin.c    | 2 +-
 src/modules/m_svslusers.c  | 2 +-
 src/modules/m_svsmode.c    | 2 +-
 src/modules/m_svsmotd.c    | 2 +-
 src/modules/m_svsnick.c    | 2 +-
 src/modules/m_svsnline.c   | 2 +-
 src/modules/m_svsnoop.c    | 2 +-
 src/modules/m_svso.c       | 2 +-
 src/modules/m_svspart.c    | 2 +-
 src/modules/m_svssilence.c | 2 +-
 src/modules/m_svswatch.c   | 2 +-
 src/modules/m_swhois.c     | 2 +-
 src/modules/m_tkl.c        | 4 ++--
 src/modules/m_tsctl.c      | 2 +-
 src/modules/m_unkline.c    | 2 +-
 src/modules/m_unsqline.c   | 2 +-
 src/modules/m_unzline.c    | 2 +-
 src/modules/m_vhost.c      | 2 +-
 src/modules/m_who.c        | 2 +-
 src/modules/m_whois.c      | 2 +-
 48 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/Changes b/Changes
index 50c1b84dd..d2dd5dc16 100644
--- a/Changes
+++ b/Changes
@@ -2577,3 +2577,4 @@ seen. gmtime warning still there
 - Changed emailaddr in help window at windows to unreal-users mailinglist.
 - Made the cloak mismatch msg during linking a bit more scary.
 - Added comment to 'Install as a service' option in installer to help n00bs a bit.
+- Made win32 work again (broke it by /module patch 30 minutes ago).
diff --git a/include/struct.h b/include/struct.h
index 69c838aba..afa23de12 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1602,6 +1602,8 @@ int	throttle_can_connect(struct IN_ADDR *in);
 
 #define VERIFY_OPERCOUNT(clnt,tag) { if (IRCstats.operators < 0) verify_opercount(clnt,tag); } while(0)
 
+#define MARK_AS_OFFICIAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);  } while(0)
+
 #endif /* __struct_include__ */
 
 #include "dynconf.h"
diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c
index fea12db8d..1ffc00c5b 100644
--- a/src/modules/l_commands.c
+++ b/src/modules/l_commands.c
@@ -203,7 +203,7 @@ int    l_commands_Init(ModuleInfo *modinfo)
 #ifdef GUEST
 	m_guest_Init(ModCmdsInfo);
 #endif
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 #ifdef DYNAMIC_LINKING
diff --git a/src/modules/m_adminchat.c b/src/modules/m_adminchat.c
index 4be17627e..6a617be43 100644
--- a/src/modules/m_adminchat.c
+++ b/src/modules/m_adminchat.c
@@ -67,7 +67,7 @@ DLLFUNC int MOD_INIT(m_adminchat)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_ADMINCHAT, TOK_ADMINCHAT, m_admins, 1);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_akill.c b/src/modules/m_akill.c
index 774b654a7..58365e0a4 100644
--- a/src/modules/m_akill.c
+++ b/src/modules/m_akill.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_akill)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_AKILL, TOK_AKILL, m_akill, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_away.c b/src/modules/m_away.c
index 246542f32..a5e8808d5 100644
--- a/src/modules/m_away.c
+++ b/src/modules/m_away.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_away)
 DLLFUNC int MOD_INIT(m_away)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_AWAY, TOK_AWAY, m_away, 1);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c
index 6db0bb932..cc49f2701 100644
--- a/src/modules/m_chghost.c
+++ b/src/modules/m_chghost.c
@@ -63,7 +63,7 @@ DLLFUNC int MOD_INIT(m_chghost)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CHGHOST, TOK_CHGHOST, m_chghost, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c
index 1d62ba839..5601e6b70 100644
--- a/src/modules/m_chgident.c
+++ b/src/modules/m_chgident.c
@@ -70,7 +70,7 @@ DLLFUNC int MOD_INIT(m_chgident)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CHGIDENT, TOK_CHGIDENT, m_chgident, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index e36274009..761b1c67d 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_chgname)(ModuleInfo *modinfo)
 	*/
 	add_Command(MSG_CHGNAME, TOK_CHGNAME, m_chgname, 2);
         add_Command(MSG_SVSNAME, TOK_CHGNAME, m_chgname, 2);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_cycle.c b/src/modules/m_cycle.c
index 30e2d015d..73c7559ef 100644
--- a/src/modules/m_cycle.c
+++ b/src/modules/m_cycle.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_cycle)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_CYCLE, TOK_CYCLE, m_cycle, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_guest.c b/src/modules/m_guest.c
index 3592e44dc..947fbfd9e 100644
--- a/src/modules/m_guest.c
+++ b/src/modules/m_guest.c
@@ -69,7 +69,7 @@ DLLFUNC int MOD_INIT(m_guest)(ModuleInfo *modinfo)
 	ModGuestInfo = modinfo;
 	GuestHook = HookAddEx(ModGuestInfo->handle, HOOKTYPE_GUEST, m_guest);
 #endif
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_htm.c b/src/modules/m_htm.c
index 542901100..499d6223e 100644
--- a/src/modules/m_htm.c
+++ b/src/modules/m_htm.c
@@ -107,7 +107,7 @@ DLLFUNC int MOD_INIT(m_htm)(ModuleInfo *modinfo)
 	e_htmcalc = EventAddEx(HtmModInfo->handle, "htmcalc", 1, 0, htm_calc, NULL);
 	UnlockEventSystem();
 #endif
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c
index 2a4285a4a..9781d2f8e 100644
--- a/src/modules/m_kill.c
+++ b/src/modules/m_kill.c
@@ -66,7 +66,7 @@ DLLFUNC int MOD_INIT(m_kill)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_KILL, TOK_KILL, m_kill, 2);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c
index 6521e1b52..4d77b6318 100644
--- a/src/modules/m_lag.c
+++ b/src/modules/m_lag.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_lag)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_LAG, TOK_LAG, m_lag, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index fa8381aa7..87d53a4f0 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -72,7 +72,7 @@ DLLFUNC int MOD_INIT(m_message)(ModuleInfo *modinfo)
 	*/
 	add_CommandX(MSG_PRIVATE, TOK_PRIVATE, m_private, MAXPARA, M_USER|M_SERVER|M_RESETIDLE);
 	add_Command(MSG_NOTICE, TOK_NOTICE, m_notice, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 	
 }
diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c
index a108aa470..d989e69bf 100644
--- a/src/modules/m_mkpasswd.c
+++ b/src/modules/m_mkpasswd.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_mkpasswd)
 DLLFUNC int MOD_INIT(m_mkpasswd)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_nachat.c b/src/modules/m_nachat.c
index c8f3f616b..5b54810f4 100644
--- a/src/modules/m_nachat.c
+++ b/src/modules/m_nachat.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_nachat)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_NACHAT, TOK_NACHAT, m_nachat, 1);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c
index 5f4cece12..7c14093e7 100644
--- a/src/modules/m_oper.c
+++ b/src/modules/m_oper.c
@@ -97,7 +97,7 @@ DLLFUNC int MOD_INIT(m_oper)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_OPER, TOK_OPER, m_oper, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index 445f44b22..21e6e02f9 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -75,7 +75,7 @@ DLLFUNC int MOD_INIT(m_pingpong)(ModuleInfo *modinfo)
 
 	add_Command(MSG_PING, TOK_PING, m_ping, MAXPARA);
 	add_CommandX(MSG_PONG, TOK_PONG, m_pong, MAXPARA, M_UNREGISTERED|M_USER|M_SERVER|M_SHUN);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c
index 6286f51dc..49d152bb9 100644
--- a/src/modules/m_quit.c
+++ b/src/modules/m_quit.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_quit)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_CommandX(MSG_QUIT, TOK_QUIT, m_quit, 1, M_UNREGISTERED|M_USER);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c
index cdcab6bee..851cb2b11 100644
--- a/src/modules/m_rakill.c
+++ b/src/modules/m_rakill.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_rakill)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_RAKILL, TOK_RAKILL, m_rakill, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c
index 680f9f201..c561c973c 100644
--- a/src/modules/m_rping.c
+++ b/src/modules/m_rping.c
@@ -71,7 +71,7 @@ DLLFUNC int MOD_INIT(m_rping)(ModuleInfo *modinfo)
 	*/
 	add_Command(MSG_RPING, TOK_RPING, m_rping, MAXPARA);
 	add_Command(MSG_RPONG, TOK_RPONG, m_rpong, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c
index c557d6948..9e48ab5bd 100644
--- a/src/modules/m_sdesc.c
+++ b/src/modules/m_sdesc.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_sdesc)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SDESC, TOK_SDESC, m_sdesc, 1);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c
index 95c03d1c5..ea222e37f 100644
--- a/src/modules/m_sendumode.c
+++ b/src/modules/m_sendumode.c
@@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_sendumode)(ModuleInfo *modinfo)
 	*/
 	add_Command(MSG_SENDUMODE, TOK_SENDUMODE, m_sendumode, MAXPARA);
 	add_Command(MSG_SMO, TOK_SMO, m_sendumode, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c
index 939d7f5f2..e887a0f9a 100644
--- a/src/modules/m_sethost.c
+++ b/src/modules/m_sethost.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_sethost)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETHOST, TOK_SETHOST, m_sethost, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c
index b23e1d534..7085f6338 100644
--- a/src/modules/m_setident.c
+++ b/src/modules/m_setident.c
@@ -64,7 +64,7 @@ DLLFUNC int MOD_INIT(m_setident)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETIDENT, TOK_SETIDENT, m_setident, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c
index 1bd446717..d9283bb8e 100644
--- a/src/modules/m_setname.c
+++ b/src/modules/m_setname.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_setname)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SETNAME, TOK_SETNAME, m_setname, 1);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c
index 4349f8505..59fb6cbc7 100644
--- a/src/modules/m_sqline.c
+++ b/src/modules/m_sqline.c
@@ -67,7 +67,7 @@ DLLFUNC int MOD_INIT(m_sqline)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SQLINE, TOK_SQLINE, m_sqline, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsjoin.c b/src/modules/m_svsjoin.c
index a72f144a9..5fbf15adb 100644
--- a/src/modules/m_svsjoin.c
+++ b/src/modules/m_svsjoin.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_svsjoin)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSJOIN, TOK_SVSJOIN, m_svsjoin, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svslusers.c b/src/modules/m_svslusers.c
index 69e157196..416aee244 100644
--- a/src/modules/m_svslusers.c
+++ b/src/modules/m_svslusers.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_svslusers)
 DLLFUNC int MOD_INIT(m_svslusers)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSLUSERS, TOK_SVSLUSERS, m_svslusers, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c
index 497b63075..db7e70687 100644
--- a/src/modules/m_svsmode.c
+++ b/src/modules/m_svsmode.c
@@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_svsmode)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA);
 	add_Command(MSG_SVS2MODE, TOK_SVS2MODE, m_svs2mode, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index 645443947..789d53cf8 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -64,7 +64,7 @@ ModuleHeader MOD_HEADER(m_svsmotd)
 DLLFUNC int MOD_INIT(m_svsmotd)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c
index 6acdad04e..7f8417b3d 100644
--- a/src/modules/m_svsnick.c
+++ b/src/modules/m_svsnick.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_svsnick)
 DLLFUNC int MOD_INIT(m_svsnick)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnline.c b/src/modules/m_svsnline.c
index 924ef9e30..ada5595b6 100644
--- a/src/modules/m_svsnline.c
+++ b/src/modules/m_svsnline.c
@@ -68,7 +68,7 @@ DLLFUNC int MOD_INIT(m_svsnline)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSNLINE, TOK_SVSNLINE, m_svsnline, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svsnoop.c b/src/modules/m_svsnoop.c
index 499d09959..9c4b066f5 100644
--- a/src/modules/m_svsnoop.c
+++ b/src/modules/m_svsnoop.c
@@ -67,7 +67,7 @@ ModuleHeader MOD_HEADER(m_svsnoop)
 DLLFUNC int MOD_INIT(m_svsnoop)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svso.c b/src/modules/m_svso.c
index 44d6484b6..f2244d183 100644
--- a/src/modules/m_svso.c
+++ b/src/modules/m_svso.c
@@ -99,7 +99,7 @@ ModuleHeader MOD_HEADER(m_svso)
 DLLFUNC int MOD_INIT(m_svso)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SVSO, TOK_SVSO, m_svso, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svspart.c b/src/modules/m_svspart.c
index b027ebe62..8ba7d7fe1 100644
--- a/src/modules/m_svspart.c
+++ b/src/modules/m_svspart.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_svspart)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSPART, TOK_SVSPART, m_svspart, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svssilence.c b/src/modules/m_svssilence.c
index d840672b0..2bbd58d4c 100644
--- a/src/modules/m_svssilence.c
+++ b/src/modules/m_svssilence.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_svssilence)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSSILENCE, TOK_SVSSILENCE, m_svssilence, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_svswatch.c b/src/modules/m_svswatch.c
index 70d8fc260..c8fc58d53 100644
--- a/src/modules/m_svswatch.c
+++ b/src/modules/m_svswatch.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_svswatch)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_SVSWATCH, TOK_SVSWATCH, m_svswatch, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c
index 554765e63..86a5952ff 100644
--- a/src/modules/m_swhois.c
+++ b/src/modules/m_swhois.c
@@ -63,7 +63,7 @@ ModuleHeader MOD_HEADER(m_swhois)
 DLLFUNC int MOD_INIT(m_swhois)(ModuleInfo *modinfo)
 {
 	add_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index 3cabfd6dd..a154c0ef0 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -57,7 +57,7 @@ ModuleHeader MOD_HEADER(m_tkl)
 /* This is called on module init, before Server Ready */
 DLLFUNC int MOD_INIT(m_tkl)(ModuleInfo *modinfo)
 {
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	/*
 	 * We call our add_Command crap here
 	*/
@@ -66,7 +66,7 @@ DLLFUNC int MOD_INIT(m_tkl)(ModuleInfo *modinfo)
 	add_Command(MSG_ZLINE, TOK_NONE, m_tzline, 3);
 	add_Command(MSG_KLINE, TOK_NONE, m_tkline, 3);
 	add_Command(MSG_GZLINE, TOK_NONE, m_gzline, 3);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c
index e31df6244..8cd3019df 100644
--- a/src/modules/m_tsctl.c
+++ b/src/modules/m_tsctl.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_tsctl)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_TSCTL, TOK_TSCTL, m_tsctl, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c
index 8574f7f63..6d80bc7d5 100644
--- a/src/modules/m_unkline.c
+++ b/src/modules/m_unkline.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_unkline)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNKLINE, TOK_UNKLINE, m_unkline, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c
index 2faad9867..f7ab465c7 100644
--- a/src/modules/m_unsqline.c
+++ b/src/modules/m_unsqline.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_unsqline)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNSQLINE, TOK_UNSQLINE, m_unsqline, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c
index 3a0c13651..3dd665928 100644
--- a/src/modules/m_unzline.c
+++ b/src/modules/m_unzline.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_unzline)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_UNZLINE, TOK_UNZLINE, m_unzline, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_vhost.c b/src/modules/m_vhost.c
index 490e1b8a2..56c64d70e 100644
--- a/src/modules/m_vhost.c
+++ b/src/modules/m_vhost.c
@@ -65,7 +65,7 @@ DLLFUNC int MOD_INIT(m_vhost)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_VHOST, TOK_VHOST, m_vhost, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_who.c b/src/modules/m_who.c
index d49815e6c..14fc7a85e 100644
--- a/src/modules/m_who.c
+++ b/src/modules/m_who.c
@@ -61,7 +61,7 @@ DLLFUNC int MOD_INIT(m_who)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_WHO, TOK_WHO, m_who, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }
 
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index 5cab8b214..c74ffe7ef 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -67,7 +67,7 @@ DLLFUNC int MOD_INIT(m_whois)(ModuleInfo *modinfo)
 	 * We call our add_Command crap here
 	*/
 	add_Command(MSG_WHOIS, TOK_WHOIS, m_whois, MAXPARA);
-	ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
 	return MOD_SUCCESS;
 }