diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2007-06-10 22:55:36 +0000 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2007-06-10 22:55:36 +0000 |
| commit | f203d73c2fb76ee6bba75c645ab4b7b7f2a9f148 (patch) | |
| tree | ad49ec56ce532d37c4d78ba0e59442f0a10639d2 /pop3.c | |
| parent | b18e438aad0f8f7015b50ef138c63957adfa3eaa (diff) | |
| download | fetchmail-f203d73c2fb76ee6bba75c645ab4b7b7f2a9f148.tar.gz fetchmail-f203d73c2fb76ee6bba75c645ab4b7b7f2a9f148.tar.bz2 fetchmail-f203d73c2fb76ee6bba75c645ab4b7b7f2a9f148.zip | |
No longer complain about invalid sslproto "" when POP3 CAPA probe fails.
Fixes Debian Bug#421446 (Holger Leskien), Novell Bug #247233 (Jon Nelson).
Thanks to Matthias Strauß for a configuration to reproduce the issue.
svn path=/branches/BRANCH_6-3/; revision=5109
Diffstat (limited to 'pop3.c')
| -rw-r--r-- | pop3.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -449,7 +449,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) report(stderr, GT_("TLS is mandatory for this session, but server refused CAPA command.\n")); report(stderr, GT_("The CAPA command is however necessary for TLS.\n")); return ok; - } else { + } else if (maybe_tls(ctl)) { /* defeat opportunistic STLS */ xfree(ctl->sslproto); ctl->sslproto = xstrdup(""); @@ -526,7 +526,7 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting) } } } - } + } /* maybe_tls() */ #endif /* SSL_ENABLE */ /* |