diff --git a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h index 0132cecbb..4db353f40 100644 --- a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h +++ b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h @@ -59,7 +59,7 @@ public: /// Destroys the SMTPClientSession. bool startTLS(); - /// Sends a STARTTLS command and, if successful, + /// Sends a STARTTLS command and, if successful, /// creates a secure SSL/TLS connection over the /// existing socket connection. /// @@ -71,7 +71,7 @@ public: /// false otherwise. bool startTLS(Context::Ptr pContext); - /// Sends a STARTTLS command and, if successful, + /// Sends a STARTTLS command and, if successful, /// creates a secure SSL/TLS connection over the /// existing socket connection. /// @@ -84,9 +84,6 @@ public: /// /// Returns true if the STARTTLS command was successful, /// false otherwise. - -private: - std::string _host; }; diff --git a/NetSSL_Win/src/SecureSMTPClientSession.cpp b/NetSSL_Win/src/SecureSMTPClientSession.cpp index 8589baaee..c1fa7d9a3 100644 --- a/NetSSL_Win/src/SecureSMTPClientSession.cpp +++ b/NetSSL_Win/src/SecureSMTPClientSession.cpp @@ -29,8 +29,7 @@ SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& socket): SecureSMTPClientSession::SecureSMTPClientSession(const std::string& host, Poco::UInt16 port): - SMTPClientSession(host, port), - _host(host) + SMTPClientSession(host, port) { } @@ -50,13 +49,13 @@ bool SecureSMTPClientSession::startTLS(Context::Ptr pContext) { int status = 0; std::string response; - + status = sendCommand("STARTTLS", response); if (!isPositiveCompletion(status)) return false; - SecureStreamSocket sss(SecureStreamSocket::attach(socket(), _host, pContext)); + SecureStreamSocket sss(SecureStreamSocket::attach(socket(), host(), pContext)); socket() = sss; - + return true; }