diff options
| author | Sam Varshavchik | 2022-03-22 07:02:07 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2022-03-22 07:02:07 -0400 |
| commit | c211a259e1f81d4a7aa5825777641b06eb74f109 (patch) | |
| tree | db5fea1574b51b2d828d10ecb16a0684b133aa29 /imap | |
| parent | 3f6737c2b26ec6d3b3e51d1f909424f3f3a7840a (diff) | |
| parent | 869e8b780c21d90ef50c91ad9e4c677f6047fb01 (diff) | |
| download | courier-libs-c211a259e1f81d4a7aa5825777641b06eb74f109.tar.bz2 | |
Merge branch 'master' of github.com:svarshavchik/courier-libs
Diffstat (limited to 'imap')
| -rw-r--r-- | imap/ChangeLog | 4 | ||||
| -rw-r--r-- | imap/imapd.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index b2c7d20..4b62227 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1101,7 +1101,7 @@ "emailAddress", for compatibility with OpenSSL. * tcpd/libcouriergnutls.c (verify_client): Check for the required - certificate occured in the wrong spot. + certificate occurred in the wrong spot. * tcpd/libcouriergnutls.c (tls_connect): Add call to gnutls_certificate_set_subject() to actually request the client cert. @@ -1785,7 +1785,7 @@ 2004-05-08 Brian Candler <B.Candler@pobox.com> - * pop3dserver.c (do_retr): If error occured during RETR drop the + * pop3dserver.c (do_retr): If error occurred during RETR drop the connection (only sane thing to do). 2004-05-02 Brian Candler <B.Candler@pobox.com> diff --git a/imap/imapd.c b/imap/imapd.c index 71af3fe..8529657 100644 --- a/imap/imapd.c +++ b/imap/imapd.c @@ -6023,7 +6023,7 @@ int uid=0; libmail_kwmDestroy(storeinfo_s.keywords); free(msgset); writes(tag); - writes(" NO An error occured while" + writes(" NO An error occurred while" " updating keywords: "); writes(strerror(errno)); writes(".\r\n"); |