aboutsummaryrefslogtreecommitdiffstats
path: root/fetchmail.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-06-11 16:07:37 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-06-11 16:07:37 +0000
commit1db4207a5ffdc53bbc7cbaffe8d6f0b20bd9b030 (patch)
tree997f49b2b4a24f2691763db9533cd93abefe518d /fetchmail.c
parent672bf0838ae4d00dc71020fa9e5a8b1b377ba045 (diff)
downloadfetchmail-1db4207a5ffdc53bbc7cbaffe8d6f0b20bd9b030.tar.gz
fetchmail-1db4207a5ffdc53bbc7cbaffe8d6f0b20bd9b030.tar.bz2
fetchmail-1db4207a5ffdc53bbc7cbaffe8d6f0b20bd9b030.zip
Put in Dave Holland's feature.
svn path=/trunk/; revision=1089
Diffstat (limited to 'fetchmail.c')
-rw-r--r--fetchmail.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/fetchmail.c b/fetchmail.c
index 4e128686..a6a3a5b5 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -661,6 +661,10 @@ static int load_params(int argc, char **argv, int optind)
if (!ctl->mailboxes)
save_str(&ctl->mailboxes, -1, (char *)NULL);
+ /* maybe user overrode timeout on command line? */
+ if (ctl->server.timeout == -1)
+ ctl->server.timeout = CLIENT_TIMEOUT;
+
/* sanity checks */
if (ctl->server.port < 0)
{
@@ -873,7 +877,8 @@ void dump_params (struct query *ctl)
putchar('\n');
if (ctl->server.preauthenticate == A_KERBEROS_V4)
printf(" Kerberos V4 preauthentication enabled.\n");
- printf(" Server nonresponse timeout is %d seconds", ctl->server.timeout);
+ if (ctl->server.timeout > 0)
+ printf(" Server nonresponse timeout is %d seconds", ctl->server.timeout);
if (ctl->server.timeout == CLIENT_TIMEOUT)
printf(" (default).\n");
else