Clarify Maillennium workaround warning even more (...instead of TOP).

[~andy/fetchmail] / odmr.c

diff --git a/odmr.c b/odmr.c
index 427d07960a03388dc1259f2fb182850ea60c678a..e1fce32dc28229fdbea231d8ad82fcc238a9e633 100644 (file)
--- a/odmr.c
+++ b/odmr.c
@@ -35,7 +35,7 @@ static int odmr_ok (int sock, char *argbuf)
 {
     int ok;
 
-    ok = SMTP_ok(sock);
+    ok = SMTP_ok(sock, SMTP_MODE);
     if (ok == SM_UNRECOVERABLE)
        return(PS_PROTOCOL);
     else
@@ -51,7 +51,7 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
     char buf [MSGBUFSIZE+1];
     struct idlist *qnp;                /* pointer to Q names */
 
-    if ((ok = SMTP_ehlo(sock, fetchmailhost, 
+    if ((ok = SMTP_ehlo(sock, SMTP_MODE, fetchmailhost, 
                        ctl->server.esmtp_name, ctl->server.esmtp_password,
                        &opts)))
     {
@@ -80,11 +80,11 @@ static int odmr_getrange(int sock, struct query *ctl, const char *id,
      */
     buf[0] = '\0';
     for (qnp = ctl->domainlist; qnp; qnp = qnp->next)
-       if (strlen(buf) + strlen(qnp->id) + 1 >= sizeof(buf))
+       if (strlen(buf) + strlen((const char *)qnp->id) + 1 >= sizeof(buf))
            break;
        else
        {
-           strcat(buf, qnp->id);
+           strcat(buf, (const char *)qnp->id);
            strcat(buf, ",");
        }
     buf[strlen(buf) - 1] = '\0';       /* nuke final comma */
@@ -245,7 +245,7 @@ int doODMR (struct query *ctl)
        return(PS_SYNTAX);
     }
     if (ctl->mailboxes->id) {
-       fprintf(stderr, GT_("Option --remote is not supported with ODMR\n"));
+       fprintf(stderr, GT_("Option --folder is not supported with ODMR\n"));
        return(PS_SYNTAX);
     }
     if (check_only) {