Fixed the nss_dns.so.1 issue

git-svn-id: svn://svn.anope.org/anope/trunk@1443 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1157 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 3 insertions, 3 deletions

diff --git a/Changes b/Changes
index 307a2e2bb..5354f4539 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 Anope Version  S V N
 --------------------
+09/15 F Dealt with the nss_dns.so.1 issue on freebsd 7.                   [ #00]
 
 Anope Version 1.7.22
 --------------------
diff --git a/src/modules.c b/src/modules.c
index a87f47ca9..8a3d3a6f9 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -617,13 +617,13 @@ int loadModule(Module * m, User * u)
     m->filename = sstrdup(buf);
     ano_modclearerr();
     m->handle = ano_modopen(m->filename);
-    if ((err = ano_moderr()) != NULL) {
+    if ( m=>handle == NULL && (err = ano_moderr()) != NULL) {
         alog(err);
         return MOD_ERR_NOLOAD;
     }
     ano_modclearerr();
     func = (int (*)(int, char **))ano_modsym(m->handle, "AnopeInit");
-    if ((err = ano_moderr()) != NULL) {
+    if ( func == NULL && (err = ano_moderr()) != NULL) {
         ano_modclose(m->handle);        /* If no AnopeInit - it isnt an Anope Module, close it */
         return MOD_ERR_NOLOAD;
     }
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
index 4cea2fbb0..7697249bf 100644
--- a/src/modules/Makefile.sub
+++ b/src/modules/Makefile.sub
@@ -26,4 +26,3 @@ clean:
 
 spotless:
 	rm -f *~ *.o *.so *.c~ core
-