From b2b41ce645946ac5701e1d1b1293f440047332ab Mon Sep 17 00:00:00 2001 From: Carlos Daniel Ruvalcaba Valenzuela Date: Sat, 21 Jul 2007 02:16:58 -0700 Subject: [PATCH] SMTP and POP3 servers are standalone only now, eliminated library loading function --- backends/protocol/pop3.cpp | 7 ------- backends/protocol/smtp.cpp | 9 --------- compile.sh | 4 ++-- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/backends/protocol/pop3.cpp b/backends/protocol/pop3.cpp index dd56541..7e184a2 100644 --- a/backends/protocol/pop3.cpp +++ b/backends/protocol/pop3.cpp @@ -270,7 +270,6 @@ public: } }; -#ifdef STANDALONE class SimpleLoad : public LoadHandler { public: int Dispatch(Socket *sock, ProtocolHandler *ph){ @@ -297,10 +296,4 @@ int main(int argc, char **argv){ return 0; } -#endif -extern "C"{ -ProtocolHandler *plugin_protocol_load(){ - return new POP3Handler(); -} -} diff --git a/backends/protocol/smtp.cpp b/backends/protocol/smtp.cpp index aa47918..3b28aac 100644 --- a/backends/protocol/smtp.cpp +++ b/backends/protocol/smtp.cpp @@ -181,7 +181,6 @@ public: } }; -#ifdef STANDALONE class SimpleLoad : public LoadHandler { public: int Dispatch(Socket *sock, ProtocolHandler *ph){ @@ -208,11 +207,3 @@ int main(int argc, char **argv){ return 0; } - -#endif - -extern "C"{ -ProtocolHandler *plugin_protocol_load(){ - return new SMTPHandler(); -} -} diff --git a/compile.sh b/compile.sh index 9c05b3e..1188501 100755 --- a/compile.sh +++ b/compile.sh @@ -25,5 +25,5 @@ echo "Compiling Servers" g++ backends/auth/fsauth.cpp -lstdc++ -I./include -L./bin -lfmail `odkutils-config --libs` ${CFLAGS} -o bin/fmail-fsauth g++ backends/mailbox/fsmailbox.cpp -lstdc++ -I./include -L./bin -lfmail `odkutils-config --libs` ${CFLAGS} -o bin/fmail-fsmailbox -g++ backends/protocol/pop3.cpp -I./include -L./bin -lfmail -lstdc++ -lpcrecpp ${CFLAGS} -DSTANDALONE -o bin/fmail-pop3 -g++ backends/protocol/smtp.cpp -I./include -L./bin -lfmail -lstdc++ -lpcrecpp ${CFLAGS} -DSTANDALONE -o bin/fmail-smtp +g++ backends/protocol/pop3.cpp -I./include -L./bin -lfmail -lstdc++ -lpcrecpp ${CFLAGS} -o bin/fmail-pop3 +g++ backends/protocol/smtp.cpp -I./include -L./bin -lfmail -lstdc++ -lpcrecpp ${CFLAGS} -o bin/fmail-smtp -- 2.11.4.GIT