generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-07-04 09:37:11 +02:00
Code Issues Projects Releases Wiki Activity

SecureSMTPClientSession now uses _host from SMTPClientSession

Browse Source
This commit is contained in:
Günter Obiltschnig 2019-05-16 14:42:24 +02:00
parent dc4d36dad5
commit e98f752cff
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h
View File

@ -59,7 +59,7 @@ public:
/// Destroys the SMTPClientSession. /// Destroys the SMTPClientSession.
bool startTLS(); bool startTLS();
/// Sends a STARTTLS command and, if successful, /// Sends a STARTTLS command and, if successful,
/// creates a secure SSL/TLS connection over the /// creates a secure SSL/TLS connection over the
/// existing socket connection. /// existing socket connection.
/// ///
@ -71,7 +71,7 @@ public:
/// false otherwise. /// false otherwise.
bool startTLS(Context::Ptr pContext); 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 /// creates a secure SSL/TLS connection over the
/// existing socket connection. /// existing socket connection.
/// ///
@ -84,9 +84,6 @@ public:
/// ///
/// Returns true if the STARTTLS command was successful, /// Returns true if the STARTTLS command was successful,
/// false otherwise. /// false otherwise.
private:
std::string _host;
}; };

9
NetSSL_Win/src/SecureSMTPClientSession.cpp
View File

@ -29,8 +29,7 @@ SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& socket):
SecureSMTPClientSession::SecureSMTPClientSession(const std::string& host, Poco::UInt16 port): SecureSMTPClientSession::SecureSMTPClientSession(const std::string& host, Poco::UInt16 port):
SMTPClientSession(host, port), SMTPClientSession(host, port)
_host(host)
{ {
} }
@ -50,13 +49,13 @@ bool SecureSMTPClientSession::startTLS(Context::Ptr pContext)
{ {
int status = 0; int status = 0;
std::string response; std::string response;
status = sendCommand("STARTTLS", response); status = sendCommand("STARTTLS", response);
if (!isPositiveCompletion(status)) return false; if (!isPositiveCompletion(status)) return false;
SecureStreamSocket sss(SecureStreamSocket::attach(socket(), _host, pContext)); SecureStreamSocket sss(SecureStreamSocket::attach(socket(), host(), pContext));
socket() = sss; socket() = sss;
return true; return true;
} }