aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-01-10 13:01:32 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-01-10 13:01:32 +0000
commitca48591eeaadd3691a56aeb7562ad1d1ace215c7 (patch)
tree3233fa62cc5e0cf04fa56738bfcd5401d2ee7977
parentbe4b116402636988d66224a67be6cdfcee6624b5 (diff)
downloadfetchmail-ca48591eeaadd3691a56aeb7562ad1d1ace215c7.tar.gz
fetchmail-ca48591eeaadd3691a56aeb7562ad1d1ace215c7.tar.bz2
fetchmail-ca48591eeaadd3691a56aeb7562ad1d1ace215c7.zip
Don't infinite-loop in defaults.
svn path=/trunk/; revision=732
-rw-r--r--NEWS2
-rw-r--r--fetchmail.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index aedaba75..9e6ebc6b 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ bugs --
* Add ssh recipe correction.
+* Eliminate infinite-loop bug in defaults handling.
+
There are 180 people on the fetchmail-friends list.
------------------------------------------------------------------------------
diff --git a/fetchmail.c b/fetchmail.c
index 21ba5841..0fa6e593 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -559,7 +559,7 @@ static int load_params(int argc, char **argv, int optind)
/* if there's a defaults record, merge it and lose it */
if (querylist && strcmp(querylist->servernames->id, "defaults") == 0)
{
- for (ctl = querylist; ctl; ctl = ctl->next)
+ for (ctl = querylist->next; ctl; ctl = ctl->next)
optmerge(ctl, querylist);
querylist = querylist->next;
}