- if (pop_data->use_stls == 2) {
- ret = pop_query(pop_data, buf, sizeof(buf), "STLS");
- if (ret == PQ_NOT_CONNECTED)
- goto err_conn;
- if (ret != PQ_OK) {
- mutt_error ("%s", pop_data->err_msg);
- mutt_sleep (2);
- }
- else if (mutt_ssl_starttls (pop_data->conn))
- {
- mutt_error (_("Could not negotiate TLS connection"));
- mutt_sleep (2);
- return PQ_ERR;
- }
- else {
- /* recheck capabilities after STLS completes */
- ret = pop_capabilities (pop_data, 1);
- if (ret == PQ_NOT_CONNECTED)
- goto err_conn;
- if (ret == PQ_ERR) {
- mutt_sleep (2);
- return PQ_ERR;
- }
- }
+ else if (mutt_ssl_starttls (pop_data->conn))
+ {
+ mutt_error (_("Could not negotiate TLS connection"));
+ mutt_sleep (2);
+ return PQ_ERR;