aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--fetchmail.h11
-rw-r--r--fetchmail.man5
-rw-r--r--options.c2
4 files changed, 10 insertions, 14 deletions
diff --git a/NEWS b/NEWS
index 22b97124..cfe68850 100644
--- a/NEWS
+++ b/NEWS
@@ -2,16 +2,20 @@
(The `lines' figures total .c, .h, .l, and .y files under version control.)
+fetchmail-5.7.5 (Sat Mar 17 23:24:41 EST 2001), 20440 lines:
+
* Nalin Dahyabhai's patch to make IPv6 build on older systems.
* Restrict shrouding to just the password send so it won't leak info.
* Move an #ifdef INET6_ENABLE to deal with libc5 headers.
* Only DNS-probe entries that are active on this run.
* Fix `nospambounce' recognition.
* Updated French translation.
-* Yoshihiko SARUMARU's patch to keep Kanji out of Received headers.
+* Yoshihiko SARUMARU's patch to keep kanji out of Received headers.
* Include aclocal.m4 in the tarball (solves some build problems).
* Added HMH's patch to support configuring a specific fallback MUA.
+There are 301 people on fetchmail-friends and 564 on fetchmail-announce.
+
fetchmail-5.7.4 (Mon Mar 12 00:02:23 EST 2001), 20323 lines:
* SECURITY FIX: unsecure tempfile creation bug in fetchmailconf, thanks
diff --git a/fetchmail.h b/fetchmail.h
index 9f530031..acae237c 100644
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -15,15 +15,6 @@
#define P_ETRN 7
#define P_ODMR 8
-/*
- * We need to distinguish between mailbox and mailbag protocols.
- * Under a mailbox protocol wwe're pulling mail for a speecific user
- * and the transaction must be authenticated. Under a mailbag protocol
- * we're fetching mail for an entire domain; the client and server
- * authenticate to each other but no per-user authentication is needed.
- */
-#define MAILBOX_PROTOCOL(ctl) ((ctl)->server.protocol < P_ETRN)
-
#if INET6_ENABLE
#define SMTP_PORT "smtp"
#define KPOP_PORT "kpop"
@@ -49,7 +40,7 @@
#define A_SSH 8 /* authentication at session level */
/* some protocols (KERBEROS, GSSAPI, SSH) don't require a password */
-#define NO_PASSWORD(ctl) ((ctl)->server.authenticate > A_OTP || !MAILBOX_PROTOCOL(ctl))
+#define NO_PASSWORD(ctl) ((ctl)->server.authenticate > A_OTP || (ctl)->server.protocol == P_ETRN)
/*
* Definitions for buffer sizes. We get little help on setting maxima
diff --git a/fetchmail.man b/fetchmail.man
index 10fa921d..8bf73855 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -530,8 +530,7 @@ normal inquiry for a password. Specify \fIssh\fR when you are using
an end-to-end secure connection such as an ssh tunnel; specify
\fRgssapi\fR or \fBkerberos_v4\fR if you are using a protocol variant
that employs GSSAPI or K4. Choosing KPOP protocol automatically
-selects Kerberos authentication. This option does not work with ETRN
-or ODMR.
+selects Kerberos authentication. This option does not work with ETRN.
.SS Miscellaneous Options
.TP
.B \-f <pathname>, --fetchmailrc <pathname>
@@ -620,7 +619,7 @@ editor like
written in Python.
.SH USER AUTHENTICATION AND ENCRYPTION
-All modes except ETRN and ODMR requires authentication of the client.
+All modes except ETRN require authentication of the client.
Normal user authentication in
.I fetchmail
is very much like the authentication mechanism of
diff --git a/options.c b/options.c
index a817e541..97d6b7bb 100644
--- a/options.c
+++ b/options.c
@@ -362,6 +362,8 @@ struct query *ctl; /* option record to be initialized */
ctl->server.protocol = P_IMAP;
else if (strcasecmp(optarg,"etrn") == 0)
ctl->server.protocol = P_ETRN;
+ else if (strcasecmp(optarg,"odmr") == 0)
+ ctl->server.protocol = P_ODMR;
else {
fprintf(stderr,_("Invalid protocol `%s' specified.\n"), optarg);
errflag++;