Added warning to differs.

[~andy/fetchmail] / etrn.c

diff --git a/etrn.c b/etrn.c
index 5805134523fb42b7e1eb4908b03b0a26759d73a8..260357236ee0b718d9b49e34bc0ce14b9a41f41b 100644 (file)
--- a/etrn.c
+++ b/etrn.c
@@ -39,13 +39,13 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
 
     if ((ok = SMTP_ehlo(sock, fetchmailhost, &opts)))
     {
-       error(0, 0, _("%s's SMTP listener does not support ESMTP"),
+       report(stderr, _("%s's SMTP listener does not support ESMTP\n"),
              ctl->server.pollname);
        return(ok);
     }
     else if (!(opts & ESMTP_ETRN))
     {
-       error(0, 0, _("%s's SMTP listener does not support ETRN"),
+       report(stderr, _("%s's SMTP listener does not support ETRN\n"),
              ctl->server.pollname);
        return(PS_PROTOCOL);
     }
@@ -69,38 +69,38 @@ static int etrn_getrange(int sock, struct query *ctl, const char *id,
        {
        case 250:       /* OK, queuing for node <x> started */
            if (outlevel >= O_SILENT)
-               error(0, 0, _("Queuing for %s started"), qnp->id);
+               report(stdout, _("Queuing for %s started\n"), qnp->id);
            break;
 
        case 251:       /* OK, no messages waiting for node <x> */
            if (outlevel >= O_SILENT)
-               error(0, 0, _("No messages waiting for %s"), qnp->id);
+               report(stdout, _("No messages waiting for %s\n"), qnp->id);
            return(PS_NOMAIL);
 
        case 252:       /* OK, pending messages for node <x> started */
        case 253:       /* OK, <n> pending messages for node <x> started */
            if (outlevel >= O_SILENT)
-               error(0, 0, _("Pending messages for %s started"), qnp->id);
+               report(stdout, _("Pending messages for %s started\n"), qnp->id);
            break;
 
        case 458:       /* Unable to queue messages for node <x> */
-           error(0, -1, _("Unable to queue messages for node %s"),qnp->id);
+           report(stderr, _("Unable to queue messages for node %s\n"),qnp->id);
            return(PS_PROTOCOL);
 
        case 459:       /* Node <x> not allowed: <reason> */
-           error(0, -1, _("Node %s not allowed: %s"), qnp->id, buf);
+           report(stderr, _("Node %s not allowed: %s\n"), qnp->id, buf);
            return(PS_AUTHFAIL);
 
        case 500:       /* Syntax Error */
-           error(0, -1, _("ETRN syntax error"));
+           report(stderr, _("ETRN syntax error\n"));
            return(PS_PROTOCOL);
 
        case 501:       /* Syntax Error in Parameters */
-           error(0, -1, _("ETRN syntax error in parameters"));
+           report(stderr, _("ETRN syntax error in parameters\n"));
            return(PS_PROTOCOL);
 
        default:
-           error(0, -1, _("Unknown ETRN error %d"), atoi(buf));
+           report(stderr, _("Unknown ETRN error %d\n"), atoi(buf));
            return(PS_PROTOCOL);
        }
     }
@@ -117,11 +117,13 @@ static int etrn_logout(int sock, struct query *ctl)
 const static struct method etrn =
 {
     "ETRN",            /* ESMTP ETRN extension */
-#if INET6
+#if INET6_ENABLE
     "smtp",            /* standard SMTP port */
-#else /* INET6 */
+    "smtps",           /* ssl SMTP port */
+#else /* INET6_ENABLE */
     25,                        /* standard SMTP port */
-#endif /* INET6 */
+    465,                       /* ssl SMTP port */
+#endif /* INET6_ENABLE */
     FALSE,             /* this is not a tagged protocol */
     FALSE,             /* this does not use a message delimiter */
     etrn_ok,           /* parse command response */