diff options
Diffstat (limited to 'src/net/pop3')
| -rw-r--r-- | src/net/pop3/POP3ServiceInfos.cpp | 3 | ||||
| -rw-r--r-- | src/net/pop3/POP3Store.cpp | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/net/pop3/POP3ServiceInfos.cpp b/src/net/pop3/POP3ServiceInfos.cpp index 52387c5d..54a44771 100644 --- a/src/net/pop3/POP3ServiceInfos.cpp +++ b/src/net/pop3/POP3ServiceInfos.cpp @@ -63,7 +63,6 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const property(serviceInfos::property::SERVER_ADDRESS, serviceInfos::property::FLAG_REQUIRED), property(serviceInfos::property::SERVER_PORT, "110"), - property(serviceInfos::property::SERVER_SOCKETFACTORY), property(serviceInfos::property::TIMEOUT_FACTORY) }; @@ -89,7 +88,6 @@ const POP3ServiceInfos::props& POP3ServiceInfos::getProperties() const property(serviceInfos::property::SERVER_ADDRESS, serviceInfos::property::FLAG_REQUIRED), property(serviceInfos::property::SERVER_PORT, "995"), - property(serviceInfos::property::SERVER_SOCKETFACTORY), property(serviceInfos::property::TIMEOUT_FACTORY) }; @@ -125,7 +123,6 @@ const std::vector <serviceInfos::property> POP3ServiceInfos::getAvailablePropert list.push_back(p.PROPERTY_SERVER_ADDRESS); list.push_back(p.PROPERTY_SERVER_PORT); - list.push_back(p.PROPERTY_SERVER_SOCKETFACTORY); list.push_back(p.PROPERTY_TIMEOUT_FACTORY); diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp index 4f373268..4c3ba224 100644 --- a/src/net/pop3/POP3Store.cpp +++ b/src/net/pop3/POP3Store.cpp @@ -132,10 +132,7 @@ void POP3Store::connect() } // Create and connect the socket - socketFactory* sf = platformDependant::getHandler()-> - getSocketFactory(GET_PROPERTY(string, PROPERTY_SERVER_SOCKETFACTORY)); - - m_socket = sf->create(); + m_socket = getSocketFactory()->create(); #if VMIME_HAVE_TLS_SUPPORT if (m_secured) // dedicated port/POP3S @@ -272,13 +269,12 @@ void POP3Store::authenticate(const messageId& randomMID) } else { - // Some servers close the connection after an - // unsuccessful APOP command, so the fallback - // may not always work... + // Some servers close the connection after an unsuccessful APOP + // command, so the fallback may not always work... // // S: +OK Qpopper (version 4.0.5) at xxx starting. <30396.1126730747@xxx> // C: APOP plop c5e0a87d088ec71d60e32692d4c5bdf4 - // S: -ERR [AUTH] Password supplied for "o" is incorrect. + // S: -ERR [AUTH] Password supplied for "plop" is incorrect. // S: +OK Pop server at xxx signing off. // [Connection closed by foreign host.] @@ -298,6 +294,7 @@ void POP3Store::authenticate(const messageId& randomMID) } catch (exceptions::socket_exception&) { + internalDisconnect(); throw exceptions::authentication_error(response); } } |