projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
pop
/
pop_lib.c
diff --git
a/pop/pop_lib.c
b/pop/pop_lib.c
index
143868e
..
22b2eaa
100644
(file)
--- a/
pop/pop_lib.c
+++ b/
pop/pop_lib.c
@@
-12,10
+12,11
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "ascii.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
#include "mx.h"
#include "url.h"
#include "pop.h"
-#if
def USE_SSL
+#if
defined (USE_SSL) || defined (USE_GNUTLS)
# include "mutt_ssl.h"
#endif
# include "mutt_ssl.h"
#endif
@@
-160,6
+161,7
@@
static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
pop_data->cmd_capa = CMD_AVAILABLE;
break;
}
+ case PFD_FUNCT_ERROR:
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
case PQ_ERR:
{
pop_data->cmd_capa = CMD_NOT_AVAILABLE;
@@
-283,10
+285,8
@@
pop_query_status pop_open_connection (POP_DATA * pop_data)
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
}
mutt_error ("%s", pop_data->err_msg);
mutt_sleep (2);
}
-#if
def USE_SSL
+#if
defined (USE_SSL) || defined (USE_GNUTLS)
else if (mutt_ssl_starttls (pop_data->conn))
else if (mutt_ssl_starttls (pop_data->conn))
-#elif USE_GNUTLS
- else if (mutt_gnutls_starttls (pop_data->conn))
#endif
{
mutt_error (_("Could not negotiate TLS connection"));
#endif
{
mutt_error (_("Could not negotiate TLS connection"));