Added experimental SDPS support.

svn path=/trunk/; revision=2034

10 files changed, 126 insertions, 46 deletions

diff --git a/NEWS b/NEWS
index 5824e43e..25f872d3 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ fetchmail-4.5.5 ():
 * Modes other than ETRN no longer need to know the fetchmail host's FQDN.
   This eliminates a gethostbyname() call and makes fetchmail more independent
   of local DNS configuration quirks.
+* Added experimental SDPS code for demon.co.uk users.
 
 There are 257 people on fetchmail-friends and 255 on fetchmail-announce.
 
diff --git a/README b/README
index eb311f6f..6ccea907 100644
--- a/README
+++ b/README
@@ -9,9 +9,9 @@ normal mail user agents such as elm(1) or Mail(1).
 
 fetchmail supports standard all mail-retrieval protocols in use on the
 Internet: POP2, POP3 (including POP3 with RFC1938 one-time passwords),
-RPOP, APOP, KPOP, Compuserve's POP3 with RPA, all flavors of IMAP
-(including IMAP4rev1 with RFC1731 Kerberos v4  or GSSAPI authentication),
-and ESMTP ETRN.
+RPOP, APOP, KPOP, Compuserve's POP3 with RPA, Demon Internet's SDPS, 
+all flavors of IMAP (including IMAP4rev1 with RFC1731 Kerberos v4  or
+GSSAPI authentication), and ESMTP ETRN.
 
 The fetchmail code was developed under Linux, but has also been
 extensively tested under 4.4BSD, AIX, HP-UX versions 9 and 10, 
diff --git a/acconfig.h b/acconfig.h
index 78bb273a..b02cdf45 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -73,6 +73,9 @@
 /* Define if you want RPA support compiled in */
 #undef RPA_ENABLE
 
+/* Define if you want SDPS support compiled in */
+#undef SDPS_ENABLE
+
 /* Define if you want OPIE support compiled in */
 #undef OPIE
 
diff --git a/configure.in b/configure.in
index c50b64e3..69bab711 100644
--- a/configure.in
+++ b/configure.in
@@ -187,6 +187,13 @@ AC_ARG_ENABLE(RPA,
 	[with_RPA=no])
 test "$with_RPA" = "yes" && AC_DEFINE(RPA_ENABLE)
 
+###	use option --enable-SDPS to compile in the SDPS support
+AC_ARG_ENABLE(SDPS,
+	[  --enable-SDPS        compile in SDPS protocol support],
+	[with_SDPS=$enableval],
+	[with_SDPS=no])
+test "$with_SDPS" = "yes" && AC_DEFINE(SDPS_ENABLE)
+
 ###	use option --enable-opie to compile in the OPIE support
 AC_ARG_ENABLE(opie,
 	[  --enable-opie        support OTP through the OPIE library],
diff --git a/driver.c b/driver.c
index efff0bb2..99a5d75c 100644
--- a/driver.c
+++ b/driver.c
@@ -953,7 +953,15 @@ int num;		/* index of message */
 	     * hostnames go through.
 	     */
 	    find_server_names(received_for, ctl, &xmit_names);
-	else {
+#ifdef SDPS_ENABLE
+	else if (sdps_envto)
+	{
+	    find_server_names(sdps_envto, ctl, &xmit_names);
+	    free(sdps_envto);
+	}
+#endif /* SDPS_ENABLE */ 
+	else
+	{
 	    /*
 	     * We haven't extracted the envelope address.
 	     * So check all the "Resent-To" header addresses if 
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 3c8340f5..d7e493fc 100644
--- 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: 1998/07/31 20:56:28 $
+<td width="30%" align=right>$Date: 1998/08/03 19:21:44 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -67,24 +67,24 @@ IP address?</a><br>
 <a href="#T6">T6. How can I use fetchmail with Lotus Notes?</a><br>
 <a href="#T7">T7. How can I use fetchmail with Microsoft Exchange?</a><br>
 <a href="#T8">T8. How can I use fetchmail with Compuserve RPA?</a><br>
-<a href="#T9">T9. How can I use fetchmail with usa.net's servers?</a><br>
-<a href="#T10">T10. How can I use fetchmail with HP OpenMail?</a><br>
-<a href="#T11">T11. How can I use fetchmail with SOCKS?</a><br>
-<a href="#T12">T12. How can I use fetchmail with IPv6 and IPsec?</a><br>
-<a href="#T13">T13. How can I get fetchmail to work with ssh?</a><br>
-<a href="#T14">T14. What do I have to do to use the IMAP-GSS protocol?</a><br>
+<a href="#T9">T9. How can I use fetchmail with Demon Internet's SDPS?</a><br>
+<a href="#T10">T10. How can I use fetchmail with usa.net's servers?</a><br>
+<a href="#T11">T11. How can I use fetchmail with HP OpenMail?</a><br>
+<a href="#T12">T12. How can I use fetchmail with SOCKS?</a><br>
+<a href="#T13">T13. How can I use fetchmail with IPv6 and IPsec?</a><br>
+<a href="#T14">T14. How can I get fetchmail to work with ssh?</a><br>
+<a href="#T15">T15. What do I have to do to use the IMAP-GSS protocol?</a><br>
 
 <h1>Runtime fatal errors:</h1>
 
-<a href="#R1">R1. Fetchmail's initial gethostbyname call fails on my host.</a><br>
-<a href="#R2">R2. Fetchmail isn't working, and -v shows `SMTP connect failed' messages.</a><br>
-<a href="#R3">R3. When I try to configure an MDA, fetchmail doesn't work.</a><br>
-<a href="#R4">R4. Fetchmail dumps core when given an invalid rc file.</a><br>
-<a href="#R5">R5. Fetchmail dumps core in -V mode, but operates normally otherwise.</a><br>
-<a href="#R6">R6. Fetchmail dumps core when I use a .netrc file but works otherwise.</a><br>
-<a href="#R7">R7. Running fetchmail in daemon mode doesn't work.</a><br>
-<a href="#R8">R8. Fetchmail hangs when used with pppd.</a><br>
-<a href="#R9">R9. Fetchmail randomly dies with socket errors.</a><br>
+<a href="#R1">R1. Fetchmail isn't working, and -v shows `SMTP connect failed' messages.</a><br>
+<a href="#R2">R2. When I try to configure an MDA, fetchmail doesn't work.</a><br>
+<a href="#R3">R3. Fetchmail dumps core when given an invalid rc file.</a><br>
+<a href="#R4">R4. Fetchmail dumps core in -V mode, but operates normally otherwise.</a><br>
+<a href="#R5">R5. Fetchmail dumps core when I use a .netrc file but works otherwise.</a><br>
+<a href="#R6">R6. Running fetchmail in daemon mode doesn't work.</a><br>
+<a href="#R7">R7. Fetchmail hangs when used with pppd.</a><br>
+<a href="#R8">R8. Fetchmail randomly dies with socket errors.</a><br>
 
 <h1>Disappearing mail</h1>
 
@@ -364,7 +364,7 @@ alone will really address your security exposure.  If you think you
 might be snooped, it's better to use end-to-end encryption on your
 whole mail stream so none of it can be read.  One of the advantages of
 fetchmail over conventional SMTP-push delivery is that you may be able
-to arrange this by using ssh(1); see <a href="#T13">T13</a>.<P>
+to arrange this by using ssh(1); see <a href="#T14">T14</a>.<P>
 
 If ssh/sshd isn't available, or you find it too complicated for you to
 set up, password encryption will at least keep a malicious cracker
@@ -500,7 +500,7 @@ the <a href="http://www.socks.nec.com/">SOCKS distribution
 site</a>.)<P>
 
 The specific recipe for using fetchmail with a firewall is at <a
-href="#T11">T11</a><P>
+href="#T12">T12</a><P>
 
 <hr>
 <h2><a name="B1">B1. Lex bombs out while building the fetchmail lexer.</a></h2>
@@ -1150,7 +1150,25 @@ poll non-rpa.csi.com via "pop.site1.csi.com" with proto POP3 and options no dns
 </pre>
 
 <hr>
-<h2><a name="T9">T9. How can I use fetchmail with usa.net's servers?</a></h2>
+<h2><a name="T9">T9. How can I use fetchmail with Demon Internet's SDPS?</a></h2>
+
+Demon Internet's SDPS service is a slight extension of POP3.  You
+don't need to do anything special unless you want to retrieve in
+multidrop mode.<P>
+
+If you do want multidrop, make sure your fetchmail has SDPS enabled
+(if so, the first line of the fetchmail -V response will include the
+string "+SDPS").  If it dioesn't, rebuild from source the
+--enable-SDPS option.<P>
+
+Once you have SDPS enabled, fetchmail will automatically detect when it's
+talking to a Demon Internet host in multidrop mode, and use the *ENV
+extension to get envelope To addresses.<P>
+
+(Note: in stock 4.5.5, the SDPS code is present but untested.)<P>
+
+<hr>
+<h2><a name="T10">T10. How can I use fetchmail with usa.net's servers?</a></h2>
 
 Enable `<CODE>fetchall</CODE>'.  A user reports that the 2.2 version
 of USA.NET's POP server reports that you must use the
@@ -1172,7 +1190,7 @@ They seem to be chronically flaky.  We recommend finding another
 provider.)<P>
 
 <hr>
-<h2><a name="T10">T10. How can I use fetchmail with HP OpenMail?</a></h2>
+<h2><a name="T11">T11. How can I use fetchmail with HP OpenMail?</a></h2>
 
 No special configuration is required, but OpenMail has an annoying bug
 similar to the big one in <a href="#T7">Microsoft Exchange</a>.
@@ -1184,7 +1202,7 @@ As with M$ Exchange, the only real fix for these problems is to get a
 POP (or preferably IMAP) server that isn't brain-dead.<P>
 
 <hr>
-<h2><a name="#T11">T11. How can I use fetchmail with SOCKS?</a></h2>
+<h2><a name="T12">T12. How can I use fetchmail with SOCKS?</a></h2>
 
 Daniel Sobral &lt<a href="mailto:dcs@gns.com.br">dcs@gns.com.br</a>
 gave us the following recipe:<P>
@@ -1208,7 +1226,7 @@ gave us the following recipe:<P>
 It wasn't that hard, was it? :-)<P>
 
 <hr>
-<h2><a name="T12">T12. How can I use fetchmail with IPv6 and IPsec?</a></h2>
+<h2><a name="T13">T13. How can I use fetchmail with IPv6 and IPsec?</a></h2>
 
 To use fetchmail with IPv6, you need a system that supports IPv6, the "Basic
 Socket Interface Extensions for IPv6" (RFC 2133), and the inet6-apps kit.
@@ -1246,7 +1264,7 @@ http://www.bieringer.de/linux/IPv6/IPv6-HOWTO/IPv6-HOWTO.html</a>
 </UL>
 
 <hr>
-<h2><a name="T13">T13. How can I get fetchmail to work with ssh?</a></h2>
+<h2><a name="T14">T14. How can I get fetchmail to work with ssh?</a></h2>
 
 We have two recipes for this.  The first is a little easier to set up,
 but only supports one user at a time.<P>
@@ -1342,7 +1360,7 @@ Send a HUP signal to your inetd.
 Now just use localhost:1234 to access your POP server.<P>
 
 <hr>
-<h2><a name="T14">T14. What do I have to do to use the IMAP-GSS protocol?</a></h2>
+<h2><a name="T15">T15. What do I have to do to use the IMAP-GSS protocol?</a></h2>
 
 Fetchmail can use RFC1731 GSSAPI authorization to safely identify you
 to your IMAP server, as long as you can share Kerberos V credentials
@@ -1378,14 +1396,7 @@ Now you don't have to worry about your password appearing in cleartext in
 your .fetchmailrc, or across the network.<p>
 
 <hr>
-<h2><a name="R1">R1. Fetchmail's initial gethostbyname call fails on my host.</a></h2>
-
-This is probably due to a DNS or NIS misconfiguration.  The first
-thing to do is check your /etc/hosts file for duplicate or missing
-entries related to your host.<P>
-
-<hr>
-<h2><a name="R2">R2. Fetchmail isn't working, and -v shows `SMTP connect failed' messages.</a></h2>
+<h2><a name="R1">R1. Fetchmail isn't working, and -v shows `SMTP connect failed' messages.</a></h2>
 
 Fetchmail itself is probably working, but your SMTP port 25 listener
 is down or inaccessible.<p>
@@ -1452,7 +1463,7 @@ linked only if it is actually needed.  So under Linux it won't be, and
 this particular cause should go away.<p>
 
 <hr>
-<h2><a name="R3">R3. When I try to configure an MDA, fetchmail doesn't work.</a></h2>
+<h2><a name="R2">R2. When I try to configure an MDA, fetchmail doesn't work.</a></h2>
 
 (I hear this one from people who have run into the blank-line problem in <a href="#X1">X1</a>.)<p>
 
@@ -1467,7 +1478,7 @@ match what you sent, then fetchmail or something on the server is
 broken.<p>
 
 <hr>
-<h2><a name="#R4">R4. Fetchmail dumps core when given an invalid rc file.</a></h2>
+<h2><a name="#R3">R3. Fetchmail dumps core when given an invalid rc file.</a></h2>
 
 This is usually reported from AIX or Ultrix, but has even been known
 to happen on Linuxes without a recent version of <code>flex</code>
@@ -1483,7 +1494,7 @@ href="http://www.gnu.ai.mit.edu/order/ftp.html">mirror site</a>
 will help you get it faster.<P>
 
 <hr>
-<h2><a name="R5">R5. Fetchmail dumps core in -V mode, but operates normally otherwise.</a></h2>
+<h2><a name="R4">R4. Fetchmail dumps core in -V mode, but operates normally otherwise.</a></h2>
 
 We've had this reported to us under Linux using libc-5.4.17 and gcc-2.7.2.
 It does not occur with libc-5.3.12 or earlier versions.<p>
@@ -1499,7 +1510,7 @@ fetchmail code (they're all from within fclose, and not an fclose called
 by fetchmail, either).<p>
 
 <hr>
-<h2><a name="R6">R6. Fetchmail dumps core when I use a .netrc file but works otherwise.</a></h2>
+<h2><a name="R5">R5. Fetchmail dumps core when I use a .netrc file but works otherwise.</a></h2>
 
 We have a report that under Solaris 2.5 using gcc-2.7.2, if fetchmail
 is compiled with -O or -O2, it segfaults on startup when reading a
@@ -1513,7 +1524,7 @@ corruption screw.  But the symptom doesn't reproduce under Linux with the
 same .fetchmailrc and .netrc.<p>
 
 <hr>
-<h2><a name="R7">R7. Running fetchmail in daemon mode doesn't work.</a><br></h2>
+<h2><a name="R6">R6. Running fetchmail in daemon mode doesn't work.</a><br></h2>
 
 We have one report from a Solaris 4.1.4 user that trying to run
 fetchmail in detached daemon mode doesn't work, but that using the
@@ -1527,14 +1538,14 @@ fetchmail with -N and an ampersand to background it.<P>
 This should not happen under Linux or any truly POSIX-conformant Unix.<P>
 
 <hr>
-<h2><a name="R8">R8. Fetchmail hangs when used with pppd.</a></h2>
+<h2><a name="R7">R7. Fetchmail hangs when used with pppd.</a></h2>
 
 Your problem may be with pppd's `demand' option.  We have a report that
 fetchmail doesn't play well with it, but works with pppd if `demand'
 is turned off.  We have no idea why this is.<p>
 
 <hr>
-<h2><a name="#R9">R9. Fetchmail randomly dies with socket errors.</a></h2>
+<h2><a name="R8">R8. Fetchmail randomly dies with socket errors.</a></h2>
 
 Check the MTU value in your PPP interface reported by
 <code>/sbin/ifconfig</code>.  If it's over 600, change it in your PPP
@@ -2064,7 +2075,7 @@ Re-ordering messages is a user-agent function, anyway.<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: 1998/07/31 20:56:28 $
+<td width="30%" align=right>$Date: 1998/08/03 19:21:44 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/fetchmail-features.html b/fetchmail-features.html
index 79ef5fd4..aa0de73d 100644
--- a/fetchmail-features.html
+++ b/fetchmail-features.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: 1998/06/04 04:28:16 $
+<td width="30%" align=right>$Date: 1998/08/03 19:21:46 $
 </table>
 <HR>
 
@@ -18,6 +18,10 @@
 
 <H2>Since 4.0:</H2>
 <UL>
+<LI> Configurable support for the 
+<a href="http://www.demon.net/services/mail/sdps-tech.html">SDPS extensions</a>
+in <a href="http://www.demon.net/">www.demon.net</a>'s POP3 service.<P>
+
 <LI> There is now an interactive GUI fetchmail configurator.
 
 <LI> Code is 64-bit clean and Y2K-safe.
@@ -148,7 +152,7 @@ get-mail, gwpop, pimp-1.0, pop-perl5-1.2, popc, popmail-1.6 and upop.<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: 1998/06/04 04:28:16 $
+<td width="30%" align=right>$Date: 1998/08/03 19:21:46 $
 </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 912fdb7b..f1a983a7 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -167,6 +167,9 @@ int main (int argc, char **argv)
 #ifdef RPA_ENABLE
 	printf("+RPA");
 #endif /* RPA_ENABLE */
+#ifdef SDPS_ENABLE
+	printf("+SDPS");
+#endif /* SDPS_ENABLE */
 #ifndef ETRN_ENABLE
 	printf("-ETRN");
 #endif /* ETRN_ENABLE */
diff --git a/fetchmail.h b/fetchmail.h
index 21de95d4..7b1e7300 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -381,6 +381,9 @@ char *visbuf(const char *);
 char *showproto(int);
 void dump_config(struct runctl *runp, struct query *querylist);
 int is_host_alias(const char *, struct query *);
+#ifdef SDPS_ENABLE
+char *sdps_envto;
+#endif /* SDPS_ENABLE */
 
 void yyerror(const char *);
 int yylex(void);
diff --git a/pop3.c b/pop3.c
index 21432bcd..2514c1e8 100644
--- a/pop3.c
+++ b/pop3.c
@@ -34,6 +34,10 @@ static int phase;
 #define PHASE_FETCH	3
 #define PHASE_LOGOUT	4
 static int last;
+#ifdef SDPS_ENABLE
+static flag sdps_enable = FALSE;
+char *sdps_envto;
+#endif /* SDPS_ENABLE */
 
 #if OPIE
 static char lastok[POPBUFSIZE+1];
@@ -110,6 +114,15 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting)
 
     phase = PHASE_GETAUTH;
 
+#ifdef SDPS_ENABLE
+    /*
+     * This needs to catch both demon.co.uk and demon.net.
+     * If we see either, and we're in multidrop mode, try to use
+     * the SDPS *ENV extension.
+     */
+    sdps_enable = MULTIDROP(ctl) && strstr(greeting, "demon.");
+#endif /* SDPS_ENABLE */
+
     switch (ctl->server.protocol) {
     case P_POP3:
 	 ok = gen_transact(sock, "USER %s", ctl->remotename);
@@ -522,6 +535,33 @@ static int pop3_fetch(int sock, struct query *ctl, int number, int *lenp)
 
     /* phase = PHASE_FETCH */
 
+#ifdef SDPS_ENABLE
+    /*
+     * See http://www.demon.net/services/mail/sdps-tech.html
+     * for a description of what we're parsing here.
+     */
+    if (sdps_enable)
+    {
+	int	linecount = 0;
+
+	sdps_envto = (char *)NULL;
+	gen_send(sock, "*ENV %d", number);
+	do {
+	    if (gen_recv(sock, buf, sizeof(buf)))
+		break;
+	    linecount++;
+	    if (buf[0] == '-' || strncmp(buf , "+OK", 3))
+		break;
+	    if (linecount == 4)
+	    {
+		sdps_envto = strdup(buf);
+		error(0, 0, "*ENV returned envelope address %s");
+	    }
+	} while
+	    (buf[0] != '.' && (buf[1] == '\r' || buf[1] == '\n'));
+    }
+#endif /* SDPS_ENABLE */
+
     /*
      * Though the POP RFCs don't document this fact, on every POP3 server
      * I know of messages are marked "seen" only at the time the OK