Various minor fixes.

svn path=/trunk/; revision=2710

diff --git a/NEWS b/NEWS
index 838e0cdcc12d35602f82d95742a11fe3cd4d64b0..d149749c219fe5f3d131a7ac64bfd612b35ee769 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -16,8 +16,10 @@ package will have two security verifications instead of one...
 (The `lines' figures total .c, .h, .l, and .y files under version control.)
 
 * Fix bug introduced in 5.2.2 that stopped --syslog from working.
-* Javier Kohen's update for es.po.
-* Guy Brand's update for fr.po.
+* Update for es.po, fr.po, cs.po.
+* Message-string macros eliminated from driver.c so gettext can see them.
+* Various useful to version reporting & configure.in fixes by Chip Salzenberg.
+* Bernhard Rosenkraenzer's fix for broken Kerberos V configuration.
 
 fetchmail-5.2.3 (Tue Jan  4 01:56:11 EST 2000), 18421 lines:
 * Ken Estes's patch to check for unreachable UIDL file due to bad NFS mount.

diff --git a/configure.in b/configure.in
index 1aff940bdf35e1b923bda4b8a2cf374059eb1dba..c1a1aede40ea5d512d0d0f27de6a0703114d5761 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -330,7 +330,7 @@ AC_ARG_WITH(kerberos5,
 
 # The "then" arm (nonempty $with_kerberos5) is kind of a crock.  It works for
 # configuring the BSD/OS Kerberos IV support, though. 
-if test -n "$with_kerberos5"
+if test -n "$with_kerberos5" -a "$with_kerberos5" != "no"
 then
     # Path given
     CEFLAGS="$CEFLAGS -DKERBEROS_V5 -I$with_kerberos5/include"
@@ -342,8 +342,7 @@ then
     else
        LIBS="$LIBS -lkrb5 -lcrypto -lcom_err"
     fi
-else
-  if test "$with_kerberos5" != "no" ; then
+elif test "$with_kerberos" != "no"; then
     for dir in /usr/kerberos /usr/local/krb5 /usr/athena
     do
       if test -f "$dir/include/krb5.h"
@@ -361,7 +360,6 @@ else
         break
       fi
     done
-  fi
 fi
 
 ###    use option --with-ssl to compile in the SSL support
@@ -420,6 +418,7 @@ then
     fi
     LDEFLAGS="$LDEFLAGS -L$with_ssl/lib"
     LIBS="$LIBS -lssl -lcrypto"
+    AC_DEFINE(SSL_ENABLE)
 else
     echo 'Disabling SSL support...'
 fi
@@ -437,7 +436,7 @@ then
   echo "Configuring kerberosIV for `uname`"
   CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I/usr/include/kerberosIV"
   LIBS="$LIBS -lkrb -ldes"
-elif test -n "$with_kerberos" -a -n "$with_kerberos5"
+elif test -n "$with_kerberos" -a -n "$with_kerberos5" -a "$with_kerberos" != "no"
 then
     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
     LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
@@ -448,7 +447,7 @@ then
     else
        LIBS="-lkrb4 -ldes425 $LIBS"
     fi
-elif test -n "$with_kerberos5"
+elif test -n "$with_kerberos5" -a "$with_kerberos" != "no"
 then
     for dir in /usr/kerberos /usr/kerberosIV /usr/athena
     do

diff --git a/driver.c b/driver.c
index bc8d1265642ec45c2f0b067f996eca04e89f0a82..349724050393566891fbb008af0d7b447d2043cc 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -897,7 +897,7 @@ static int readheaders(int sock,
             * We haven't extracted the envelope address.
             * So check all the "Resent-To" header addresses if 
             * they exist.  If and only if they don't, consider
-            * the "To" adresses.
+            * the "To" addresses.
             */
            register struct addrblk *nextptr;
            if (resent_to_addrchain) {
@@ -1510,12 +1510,6 @@ const int maxfetch;              /* maximum number of messages to fetch */
            if (timeoutcount > MAX_TIMEOUTS 
                && !open_warning_by_mail(ctl, (struct msgblk *)NULL))
            {
-#define TIMEOUT_WARNING \
-    "This could mean that your mailserver is stuck, or that your SMTP\r\n" \
-    "server is wedged, or that your mailbox file on the server has been\r\n" \
-    "corrupted by a server error.  You can run `fetchmail -v -v' to\r\n" \
-    "diagnose the problem.\r\n\r\n" \
-    "Fetchmail won't poll this mailbox again until you restart it.\r\n"
                stuff_warning(ctl,
                              _("Subject: fetchmail sees repeated timeouts\r\n"));
                stuff_warning(ctl,
@@ -1523,10 +1517,14 @@ const int maxfetch;             /* maximum number of messages to fetch */
                              MAX_TIMEOUTS,
                              ctl->remotename,
                              ctl->server.truename);
-               stuff_warning(ctl, _(TIMEOUT_WARNING));
+               stuff_warning(ctl, 
+    _("This could mean that your mailserver is stuck, or that your SMTP\r\n" \
+    "server is wedged, or that your mailbox file on the server has been\r\n" \
+    "corrupted by a server error.  You can run `fetchmail -v -v' to\r\n" \
+    "diagnose the problem.\r\n\r\n" \
+    "Fetchmail won't poll this mailbox again until you restart it.\r\n"));
                close_warning_by_mail(ctl, (struct msgblk *)NULL);
                ctl->wedged = TRUE;
-#undef TIMEOUT_WARNING
            }
 
            ok = PS_ERROR;
@@ -1698,21 +1696,19 @@ const int maxfetch;             /* maximum number of messages to fetch */
                        && ctl->authfailcount++ > MAX_AUTHFAILS 
                        && !open_warning_by_mail(ctl, (struct msgblk *)NULL))
                    {
-#define LOGIN_ERROR    \
-    "The attempt to get authorization failed.\r\n" \
-    "This probably means your password is invalid, but POP3 servers have\r\n" \
-    "other failure modes that fetchmail cannot distinguish from this\r\n" \
-    "because they don't send useful error messages on login failure.\r\n"
                        stuff_warning(ctl,
                            _("Subject: fetchmail authentication failed\r\n"));
                        stuff_warning(ctl,
                            _("Fetchmail could not get mail from %s@%s.\r\n"), 
                            ctl->remotename,
                            ctl->server.truename);
-                       stuff_warning(ctl, _(LOGIN_ERROR));
+                       stuff_warning(ctl, 
+    _("The attempt to get authorization failed.\r\n" \
+    "This probably means your password is invalid, but POP3 servers have\r\n" \
+    "other failure modes that fetchmail cannot distinguish from this\r\n" \
+    "because they don't send useful error messages on login failure.\r\n"));
                        close_warning_by_mail(ctl, (struct msgblk *)NULL);
                        ctl->wedged = TRUE;
-#undef LOGIN_ERROR
                    }
                }
                goto cleanUp;

diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 60f7439f635cda79d466890c565c491f9ce1e17c..23f6f720492361ebaa42609a46f2d1345e420a4b 100644 (file)
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/01/09 07:59:37 $
+<td width="30%" align=right>$Date: 2000/01/16 17:40:21 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -218,9 +218,10 @@ suspicion that the bug was triggered by a particular message, please
 include a copy of the message that triggered the bug.<p>
 
 Often, the first thing I will do when you report a bug is tell you to
-upgrade to the newest version, and then see if the problem reproduces.
-So you'll probably save us both time if you upgrade and test with
-the latest version <em>before</em> sending in a bug report.<P>
+upgrade to the newest version of fetchmail, and then see if the
+problem reproduces.  So you'll probably save us both time if you
+upgrade and test with the latest version <em>before</em> sending in a
+bug report.<P>
 
 It is helpful if you include your .fetchmailrc file, but not necessary
 unless your symptom seems to involve an error in configuration
@@ -2555,7 +2556,7 @@ terminate it.<p>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2000/01/09 07:59:37 $
+<td width="30%" align=right>$Date: 2000/01/16 17:40:21 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>

diff --git a/fetchmail.h b/fetchmail.h
index 0e19d7cb2a160431ee1f5c77077debcc3480bfa9..c5cc8671cbf8c7ffba298f96c115065c165095c1 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -433,7 +433,7 @@ char *str_find(struct idlist **, int);
 char *idpair_find(struct idlist **, const char *);
 void append_str_list(struct idlist **, struct idlist **);
 void expunge_uids(struct query *);
-void uid_expunge_query(struct query *);
+void uid_end_query(struct query *);
 void write_saved_lists(struct query *, const char *);
 
 /* rcfile_y.y */

diff --git a/socket.c b/socket.c
index a03be4bfaf51388eea69a7174c3ab758ed20a355..4dde204888f60477f36ae4f9fb82f1dd610e8a2b 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -530,10 +530,10 @@ int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx )
                                *str_ptr = '\0';
                        }
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Issuer Organization: %s", cbuf );
+                               report(stdout, "Issuer Organization: %s\n", cbuf );
                } else {
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Unknown Organization", cbuf );
+                               report(stdout, "Unknown Organization\n", cbuf );
                }
                if( ( str_ptr = strstr( ibuf, "/CN=" ) ) ) {
                        str_ptr += 4;
@@ -542,10 +542,10 @@ int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx )
                                *str_ptr = '\0';
                        }
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Issuer CommonName: %s", cbuf );
+                               report(stdout, "Issuer CommonName: %s\n", cbuf );
                } else {
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Unknown Issuer CommonName", cbuf );
+                               report(stdout, "Unknown Issuer CommonName\n", cbuf );
                }
                if( ( str_ptr = strstr( buf, "/CN=" ) ) ) {
                        str_ptr += 4;
@@ -554,14 +554,17 @@ int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx )
                                *str_ptr = '\0';
                        }
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Server CommonName: %s", cbuf );
+                               report(stdout, "Server CommonName: %s\n", cbuf );
                        /* Should we have some wildcarding here? */
-                       if ( NULL != _ssl_server_cname && 0 != strcmp( cbuf, _ssl_server_cname ) ) {
-                               report(stdout, "Server CommonName mismatch: %s != %s", cbuf, _ssl_server_cname );
+                       if ( NULL != _ssl_server_cname
+                            && 0 != strcmp( cbuf, _ssl_server_cname ) ) {
+                               report(stdout,
+                                      "Server CommonName mismatch: %s != %s\n",
+                                      cbuf, _ssl_server_cname );
                        }
                } else {
                        if (outlevel == O_VERBOSE)
-                               report(stdout, "Unknown Server CommonName", cbuf );
+                               report(stdout, "Unknown Server CommonName\n", cbuf );
                }
        }