From 6076d5da019c37df48fb626d1b46bf242361388b Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 1 Sep 2019 12:24:16 -0600 Subject: * Improvements to documentation and behavior of Alpine when users get a non-empty challenge in a smtp server. --- imap/src/c-client/smtp.c | 13 +++++++------ pith/mailview.c | 2 +- pith/pine.hlp | 40 ++++++++++++++++++++-------------------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/imap/src/c-client/smtp.c b/imap/src/c-client/smtp.c index a01c87b..c79d9cf 100644 --- a/imap/src/c-client/smtp.c +++ b/imap/src/c-client/smtp.c @@ -357,13 +357,14 @@ void *smtp_challenge (void *s,unsigned long *len) char tmp[MAILTMPLEN]; void *ret = NIL; SENDSTREAM *stream = (SENDSTREAM *) s; - if ((stream->replycode == SMTPAUTHREADY) && - !(ret = rfc822_base64 ((unsigned char *) stream->reply + 4, + if (stream->replycode == SMTPAUTHREADY){ + if(!(ret = rfc822_base64 ((unsigned char *) stream->reply + 4, strlen (stream->reply + 4),len))) { - sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4); - mm_log (tmp,ERROR); - ret = cpystr(""); /* This is silly: fake a reply, it will be ignored */ - *len = 0L; + sprintf (tmp,"SMTP SERVER BUG (invalid challenge, continuing): %.80s",stream->reply+4); + mm_log (tmp,ERROR); + ret = cpystr(""); /* This is silly: fake a reply, it will be ignored */ + } + *len = 0L; /* This is even sillier, fake challenge is empty... */ } return ret; } diff --git a/pith/mailview.c b/pith/mailview.c index 8975086..cd50e88 100644 --- a/pith/mailview.c +++ b/pith/mailview.c @@ -2080,7 +2080,7 @@ url_external_specific_handler(char *url, int len) } else dprint((1, - "* * * HANLDER TOO LONG: %.*s\n", n, + "* * * HANDLER TOO LONG: %.*s\n", n, p ? p : "?")); n++; diff --git a/pith/pine.hlp b/pith/pine.hlp index 2337657..41d7521 100644 --- a/pith/pine.hlp +++ b/pith/pine.hlp @@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any reasonable place to be called from. Dummy change to get revision in pine.hlp ============= h_revision ================= -Alpine Commit 365 2019-08-22 19:11:49 +Alpine Commit 366 2019-09-01 12:23:55 ============= h_news ================= @@ -530,7 +530,7 @@ Additions include: be transformed to UTF-8 for further transformation through internal and user defined filters for saving. -
  • Add command line argument -smimedir, which allows to specify +
  • Add command line argument -smimedir, which allows users to specify the default path for a directory that contains the public, private, and ca directories. This is useful in case a user has a backup of old certificates that cannot be installed in the ~/.alpine-smime @@ -1788,7 +1788,7 @@ For example, if

    $VAR

    appears in the value of an Alpine configuration option it is looked up in the -environent (using getenv("VAR")) and its +envirom ent (using getenv("VAR")) and its looked-up value replaces the $VAR part of the option value. To include a literal dollar sign you may precede the dollar sign with another dollar sign. @@ -4489,7 +4489,7 @@ There are also additional details on

  • NEW USER GREETING
  • NEW VERSION GREETING
  • News Reading -
  • Newsgroup Subcribe Screen explained +
  • Newsgroup Subscribe Screen explained
  • Newsgroup selecting for Posting explained
  • NextNew Command
  • Nickname Selection Explained @@ -5031,7 +5031,7 @@ either local or remote. For PC-Alpine, the personal exceptions configuration file is named PINERCEX and is in the same directory as the personal configuration file unless the personal configuration file is remote. -In that case, it is in the local directory specfied by the +In that case, it is in the local directory specified by the "-aux local_directory" command line argument. (In the case that the personal configuration is remote and there is no "-aux" command line argument, Alpine searches for @@ -11753,7 +11753,7 @@ FOR MORE INFORMATION: See the section on ===== h_folder_subscribe ===== -Newsgroup Subcribe Screen explained +Newsgroup Subscribe Screen explained

    FOLDER SUBSCRIBE HELP

    @@ -13581,7 +13581,7 @@ Available commands include:
    Delete
    Mark the viewed attachment for Deletion. The delete flag only has affect when saving the message to a folder. -Attachments marked for deletion are exluded from the messsage when +Attachments marked for deletion are excluded from the message when it is saved. In addition, the delete mark only applies to this Alpine session. @@ -13939,7 +13939,7 @@ deleted some text. You can include other text files with the "Read File" command, which will prompt you for the name of the file to insert at the -current cursor postion. +current cursor position.

      @@ -20403,7 +20403,7 @@ the Setup Kolor screen. This gives the score of each message. -This will be six columns wide to accomodate the widest possible score. +This will be six columns wide to accommodate the widest possible score. You will probably want to use the fixed-field width feature to limit the width of the field to the widest score that you use (e.g. SCORE(3) if your scores are always between 0 and 999). @@ -21048,7 +21048,7 @@ a SEARCH command correctly. If your filtering rules fail to filter some messages, that should have been filtered, then this option will make Alpine download all data necessary data to perform that search. There is a performance penalty when using this option. Downloading -the data to perfom the search will take longer than requesting the IMAP +the data to perform the search will take longer than requesting the IMAP server to perform the filtering, but the filtering will be done correctly.

    @@ -25789,7 +25789,7 @@ Sets the format of the command used to open a UNIX remote shell connection. The default is "%s %s -l %s exec /etc/r%sd". All four "%s" entries MUST exist in the provided command. The first is for the command's pathname, the second is -for the host to connnect to, the third is for the user to connect as, and +for the host to connect to, the third is for the user to connect as, and the fourth is for the connection method (typically imap).