aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--TODO.txt3
-rw-r--r--driver.c4
-rw-r--r--fetchmail.man8
4 files changed, 7 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index a9c25f30..91cf5e6e 100644
--- a/NEWS
+++ b/NEWS
@@ -48,10 +48,6 @@ removed from a 6.4.0 or newer release.)
fetchmail 6.3.10 (not yet released):
-# INCOMPATIBLE BUGFIXES
-* Use PS_PROTOCOL (4) rather than PS_SYNTAX (5) exit status when a pre- or
- post-connect command fails.
-
# BUGFIXES
* Fix misuse of canonical autoconf target as _TARGET when it should have been
_HOST. Report and patch courtesy of Diego E. "Flameeyes" Pettenò.
diff --git a/TODO.txt b/TODO.txt
index 4618076b..f5c169ab 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -55,6 +55,9 @@ questionable:
<simpkins@cisco.com> around Nov 2nd)?
6.4:
+- use PS_PROTOCOL for pre-/post-connect command failures - 6.3 uses
+ PS_SYNTAX, and that's not necessarily the case. At least if the
+ command terminates with a signal, we should report PS_PROTOCOL.
- revisit maximum allowed rcfile permissions, fix inconsistency
(silently allowing g+x).
- make UID code more efficient, parsing is O(n^2), should be no worse
diff --git a/driver.c b/driver.c
index bf4c7b5c..9f332f80 100644
--- a/driver.c
+++ b/driver.c
@@ -946,7 +946,7 @@ static int do_session(
else
report(stderr,
GT_("pre-connection command failed with status %d\n"), WEXITSTATUS(err));
- err = PS_PROTOCOL;
+ err = PS_SYNTAX;
goto closeUp;
}
@@ -1580,7 +1580,7 @@ closeUp:
else
report(stderr, GT_("post-connection command failed with status %d\n"), WEXITSTATUS(tmperr));
if (err == PS_SUCCESS)
- err = PS_PROTOCOL;
+ err = PS_SYNTAX;
}
set_timeout(0); /* cancel any pending alarm */
diff --git a/fetchmail.man b/fetchmail.man
index e2e933af..c5ede6d5 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -2532,14 +2532,10 @@ tried to run fetchmail under circumstances where it did not have
standard input attached to a terminal and could not prompt for a
missing password.
.IP 4
-Some sort of fatal protocol error was detected. Since 6.3.10, this
-includes non-zero exit status or signal-triggered termination of a pre-
-or post-connect command.
+Some sort of fatal protocol error was detected.
.IP 5
There was a syntax error in the arguments to
-.IR fetchmail .
-Up to and including 6.3.9, this was also used if the pre- or
-post-connect command failed.
+\fIfetchmail\fP, or a pre- or post-connect command failed.
.IP 6
The run control file had bad permissions.
.IP 7