From eca91bee1f2f6ad6dc7e6caa06e9d95680bf7a9d Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Sun, 20 Jan 2002 16:04:13 +0000
Subject: [PATCH] Fixed a module object bug involving static linking

---
 Changes                  | 1 +
 src/modules/m_guest.c    | 5 ++++-
 src/modules/scan.c       | 4 ++++
 src/modules/scan_http.c  | 4 ++++
 src/modules/scan_socks.c | 6 +++++-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Changes b/Changes
index 51116a8ea..cb0176302 100644
--- a/Changes
+++ b/Changes
@@ -1119,3 +1119,4 @@ v- Fixed some bugreport stuff
 - Fixed bug in m_tkl_line and various m_line functions (was checking for wrong # of paras)
 - Recoded hooks to take advantage of the module object code
 - Fixed a memory leak in hooks
+- Fixed a bug with module objects involving static linking
diff --git a/src/modules/m_guest.c b/src/modules/m_guest.c
index 9c164cf38..3febd80a8 100644
--- a/src/modules/m_guest.c
+++ b/src/modules/m_guest.c
@@ -46,8 +46,11 @@
 DLLFUNC int m_guest(aClient *cptr, aClient *sptr, int parc, char *parv[]);
 
 /* Place includes here */
-
+#ifdef DYNAMIC_LINKING
 Module *Mod_Handle = NULL;
+#else
+#define Mod_Handle NULl
+#endif
 #ifndef DYNAMIC_LINKING
 ModuleHeader m_guest_Header
 #else
diff --git a/src/modules/scan.c b/src/modules/scan.c
index 23428d27d..a51d16713 100644
--- a/src/modules/scan.c
+++ b/src/modules/scan.c
@@ -52,7 +52,11 @@
 #endif
 #include "modules/scan.h"
 /* IRCd will fill with a pointer to this module */
+#ifdef DYNAMIC_LINKING
 Module *Mod_Handle = NULL;
+#else
+#define Mod_Handle NULL
+#endif
 struct SOCKADDR_IN Scan_endpoint;
 
 static Scan_AddrStruct *Scannings = NULL;
diff --git a/src/modules/scan_http.c b/src/modules/scan_http.c
index 5f7119ea7..efb810906 100644
--- a/src/modules/scan_http.c
+++ b/src/modules/scan_http.c
@@ -68,7 +68,11 @@ static struct SOCKADDR_IN	*xScan_endpoint = NULL;
 extern void Eadd_scan();
 extern struct SOCKADDR_IN	Scan_endpoint;
 #endif
+#ifdef DYNAMIC_LINKING
 Module *Mod_Handle = NULL;
+#else 
+#define Mod_Handle NULL
+#endif
 static Mod_SymbolDepTable modsymdep[] = 
 {
 	MOD_Dep(Eadd_scan, xEadd_scan, "src/modules/scan.so"),
diff --git a/src/modules/scan_socks.c b/src/modules/scan_socks.c
index 4bf2917cf..53b5b535f 100644
--- a/src/modules/scan_socks.c
+++ b/src/modules/scan_socks.c
@@ -66,7 +66,11 @@ extern struct SOCKADDR_IN	Scan_endpoint;
 void	scan_socks_scan(Scan_AddrStruct *sr);
 void	scan_socks4_scan(Scan_AddrStruct *sr);
 void	scan_socks5_scan(Scan_AddrStruct *sr);
-Module *Mod_Handle;
+#ifdef DYNAMIC_LINKING
+Module *Mod_Handle = NULL;
+#else
+#define Mod_Handle NULL
+#endif
 static Mod_SymbolDepTable modsymdep[] = 
 {
 	MOD_Dep(Eadd_scan, xEadd_scan, "src/modules/scan.so"),