Revert incompatible pre/post-connect cmd fix part.

...and postpone for fetchmail 6.4.

svn path=/branches/BRANCH_6-3/; revision=5296

diff --git a/NEWS b/NEWS
index a9c25f30d32ffad32267f34f62debe3b9dd49c0c..91cf5e6e1eba9c3ca8dd47e851d0d2b601f922fe 100644 (file)
--- 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 4618076b6e973e77f496c07f34a4a1407742051e..f5c169aba7e3783602f977d7a9b9b894ba8211e2 100644 (file)
--- 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 bf4c7b5c6ad55c27b31b9005e80745f3a520970e..9f332f80e8b33e2f0df4bddd4fd057486bd3e35e 100644 (file)
--- 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 e2e933afaa05240e25b9113acf0c8be663bd8361..c5ede6d55247be938d5a1898dcb04680a19e9f08 100644 (file)
--- 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