From b775c84402c309ccf4bced359ee714fbedb4dd6e Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 7 May 2010 15:51:54 -0400 Subject: [PATCH] Fixed the Makefiles to build m_ssl correctly and marked m_ssl as permanent --- src/modules/Makefile | 4 ++-- src/modules/ssl/m_ssl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/Makefile b/src/modules/Makefile index 3ab2a7803..64b9373c7 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -29,12 +29,12 @@ distclean: spotless .c.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ - $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) \ + $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) $(if $(shell grep RequiredLibraries $< | grep ssl), -lssl) $(if $(shell grep RequiredLibraries $< | grep crypt), -lcrypt) \ -I../${INCLUDEDIR} -o $@ $< .cpp.so: $(MAKEBIN) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} \ - $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) \ + $(if $(shell grep RequiredLibraries $< | grep mysqlpp), $(MYSQL_ARGS)) $(if $(shell grep RequiredLibraries $< | grep ssl), -lssl) $(if $(shell grep RequiredLibraries $< | grep crypt), -lcrypt) \ -I../${INCLUDEDIR} -o $@ $< subs: diff --git a/src/modules/ssl/m_ssl.cpp b/src/modules/ssl/m_ssl.cpp index 8036de6ce..075352551 100644 --- a/src/modules/ssl/m_ssl.cpp +++ b/src/modules/ssl/m_ssl.cpp @@ -65,6 +65,7 @@ class SSLModule : public Module this->SetAuthor("Anope"); this->SetVersion("$Id$"); this->SetType(SUPPORTED); + this->SetPermanent(true); SSL_load_error_strings(); SSLeay_add_ssl_algorithms(); @@ -112,7 +113,6 @@ class SSLModule : public Module SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); SSL_CTX_set_options(ctx, SSL_OP_TLS_ROLLBACK_BUG | SSL_OP_ALL); -// SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, always_accept_verify_cb); ModuleManager::Attach(I_OnPreServerConnect, this); }