aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS11
-rw-r--r--design-notes.html14
-rw-r--r--fetchmail.c15
3 files changed, 23 insertions, 17 deletions
diff --git a/NEWS b/NEWS
index cf91b3e7..bcc4af47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,3 @@
- To do:
-
-* Warn user that fetchmailconf autoprobe may take a while? (It can hang for
- 10 or 12 minutes if it hits a firewall that drops SYN packets sent to denied
- ports.)
-
-* --all option that forces poll of skipped entries?
-
Release Notes:
(The `lines' figures total .c, .h, .l, and .y files under version control.)
@@ -17,8 +9,9 @@ fetchmail-5.1.1 ():
* John Cigas's delay patch to avoid a timing problem with plugins.
* During IMAP authentication, canonicalize both name and password.
* -A has been retired (goes with authenticate -> preauthenticate change).
+* Check for both fetchall and keep on in daemon mode; reject this.
-There are 259 people on fetchmail-friends and 440 on fetchmail-announce.
+There are 259 people on fetchmail-friends and 445 on fetchmail-announce.
------------------------------------------------------------------------------
fetchmail-5.1.0 (Wed Sep 22 01:27:42 EDT 1999), 17767 lines:
diff --git a/design-notes.html b/design-notes.html
index 356a5b3b..2204d56f 100644
--- a/design-notes.html
+++ b/design-notes.html
@@ -10,7 +10,7 @@
<table width="100%" cellpadding=0><tr>
<td width="30%">Back to <a href="/~esr/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: 1999/06/08 07:20:17 $
+<td width="30%" align=right>$Date: 1999/09/26 20:37:39 $
</table>
<HR>
<H1 ALIGN=CENTER>Design Notes On Fetchmail</H1>
@@ -358,6 +358,11 @@ following minimum steps.
There may be other things you have to do in the way of logic, of course.<P>
+Before you implement an option, though, think hard. Is there any way
+to make fetchmail automatically detect the circumstances under which
+it should change its behavior? If so, don't write an option. Just do
+the check!<p>
+
<H1>Lessons learned</H1>
<H3>1. Server-side state is essential</H3>
@@ -429,8 +434,9 @@ a gift from the gods, and this is my expression of gratitude.<P>
The beta testers didn't know it at the time, but they were also the
subjects of a sociological experiment. The results are described in
-my paper, <A HREF="//www.tuxedo.org/~esr/writings/cathedral-bazaar/">The Cathedral
-And The Bazaar</A>.
+my paper, <A
+HREF="//www.tuxedo.org/~esr/writings/cathedral-bazaar/">The Cathedral
+And The Bazaar</A>.<P>
<H1>Credits</H1>
@@ -535,7 +541,7 @@ all shaped the design in one way or another.<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: 1999/06/08 07:20:17 $
+<td width="30%" align=right>$Date: 1999/09/26 20:37:39 $
</table>
<P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail.c b/fetchmail.c
index ff465784..1ff5fd9a 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1164,11 +1164,7 @@ static int load_params(int argc, char **argv, int optind)
char *cp;
if (!(cp = strrchr(idp->id, '/')) ||
-#ifdef INET6
- (strcmp(++cp, SMTP_PORT) == 0))
-#else
(atoi(++cp) == SMTP_PORT))
-#endif /* INET6 */
{
(void) fprintf(stderr,
_("%s configuration invalid, LMTP can't use default SMTP port\n"),
@@ -1178,6 +1174,17 @@ static int load_params(int argc, char **argv, int optind)
}
}
#endif /* !INET6 */
+
+ /*
+ * "I beg to you, have mercy on the week minds like myself."
+ * wrote Pehr Anderson. Your petition is granted.
+ */
+ if (ctl->fetchall && ctl->keep && run.poll_interval && !nodetach)
+ {
+ (void) fprintf(stderr,
+ _("Both fetchall and keep on in daemon mode is a mistake!\n"));
+ exit(PS_SYNTAX);
+ }
}
}