From b7e145bdf22387e6cba4b54099407102ff310967 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 13 Mar 2006 20:17:09 +0000 Subject: add Mirek's fetchmail-lmtp.patch to fix an operator precedence bug '||' vs ',' svn path=/branches/BRANCH_6-3/; revision=4731 --- NEWS | 1 + fetchmail.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 87246ba0..1caf66e8 100644 --- a/NEWS +++ b/NEWS @@ -49,6 +49,7 @@ fetchmail 6.3.3 (not yet released): and Brendan Lynch, fix by Sunil Shetye (his patch was merged) and Brendan Lynch. * ./configure --quiet is now quieter (no SSL and fallback-related output). +* fix bug in LMTP port validation (patch by Miloslav Trmac). # CHANGES: * --idle can now be specified on the command line, too. diff --git a/fetchmail.c b/fetchmail.c index f150e8da..868a45c1 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -1254,9 +1254,9 @@ static int load_params(int argc, char **argv, int optind) { char *cp; - if (!(cp = strrchr((char *)idp->id, '/')) || - ++cp, (0 == strcmp(cp, SMTP_PORT)) - || servport(cp) == SMTP_PORT_NUM) + if (!(cp = strrchr((char *)idp->id, '/')) + || (0 == strcmp(cp + 1, SMTP_PORT)) + || servport(cp + 1) == SMTP_PORT_NUM) { (void) fprintf(stderr, GT_("%s configuration invalid, LMTP can't use default SMTP port\n"), -- cgit v1.2.3