| 67 |
|
<< "\n mailbox = " << account.getMailbox() << "\n}\n"; |
| 68 |
|
} |
| 69 |
|
|
| 70 |
< |
session = new IMAPHandler(account.getHost(), true); |
| 70 |
> |
session = new IMAPHandler(account.getHost(), account.getPort() == 993); |
| 71 |
|
|
| 72 |
< |
if (session->capability().find("IMAP4rev1") == string::npos) |
| 72 |
> |
string capability = session->capability(); |
| 73 |
> |
|
| 74 |
> |
if (capability.find(" IMAP4rev1") == string::npos) |
| 75 |
|
{ |
| 76 |
|
cerr << program << ": Server does not have IMAP4rev1 capability\n"; |
| 77 |
|
|
| 78 |
|
exit(1); |
| 79 |
|
} |
| 80 |
+ |
|
| 81 |
+ |
if (capability.find(" LOGINDISABLED") != string::npos) |
| 82 |
+ |
{ |
| 83 |
+ |
if (capability.find(" STARTTLS") != string::npos) |
| 84 |
+ |
{ |
| 85 |
+ |
session->starttls(); |
| 86 |
+ |
|
| 87 |
+ |
capability = session->capability(); |
| 88 |
+ |
} |
| 89 |
+ |
else |
| 90 |
+ |
{ |
| 91 |
+ |
cerr << program << ": Server does not allow plain text login\n"; |
| 92 |
+ |
|
| 93 |
+ |
exit(1); |
| 94 |
+ |
} |
| 95 |
+ |
} |
| 96 |
|
|
| 97 |
|
session->login(account.getLogin() + ' ' + account.getPassword()); |
| 98 |
|
|
