Merge branch 'legacy_63'

[~andy/fetchmail] / options.c

diff --git a/options.c b/options.c
index 9c23516b0b9d40fe63d2169ec4e513cc2cd3f5da..5f1739c4f6e4cdbb50c2f1975f6367ca5ff0913b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -330,8 +330,6 @@ int parsecmdline (int argc /** argument count */,
 #endif /* SDPS_ENABLE */
            else if (strcasecmp(optarg,"pop3") == 0)
                ctl->server.protocol = P_POP3;
-           else if (strcasecmp(optarg,"apop") == 0)
-               ctl->server.protocol = P_APOP;
            else if (strcasecmp(optarg,"kpop") == 0)
            {
                ctl->server.protocol = P_POP3;
@@ -389,6 +387,8 @@ int parsecmdline (int argc /** argument count */,
                ctl->server.authenticate = A_ANY;
            else if (strcmp(optarg, "msn") == 0)
                ctl->server.authenticate = A_MSN;
+           else if (strcmp(optarg, "apop") == 0)
+               ctl->server.authenticate = A_APOP;
            else {
                fprintf(stderr,GT_("Invalid authentication `%s' specified.\n"), optarg);
                errflag++;
@@ -649,7 +649,7 @@ int parsecmdline (int argc /** argument count */,
        P(GT_("      --sslcertpath path to trusted-CA ssl certificate directory\n"));
        P(GT_("      --sslcommonname  expect this CommonName from server (discouraged)\n"));
        P(GT_("      --sslfingerprint fingerprint that must match that of the server's cert.\n"));
-       P(GT_("      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"));
+       P(GT_("      --sslproto    force ssl protocol (SSL23/SSL3/TLS1)\n"));
 #endif
        P(GT_("      --plugin      specify external command to open connection\n"));
        P(GT_("      --plugout     specify external command to open smtp connection\n"));