aboutsummaryrefslogtreecommitdiffstats
path: root/fetchmail.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-04-26 03:24:47 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-04-26 03:24:47 +0000
commit06093ccd700f061429f6c5f5118ae36a14b40f7d (patch)
treedae441c5727c6685588263f6aaf314dcee7de9af /fetchmail.c
parente2070525f82a82bb2c91239087bd15c954963e01 (diff)
downloadfetchmail-06093ccd700f061429f6c5f5118ae36a14b40f7d.tar.gz
fetchmail-06093ccd700f061429f6c5f5118ae36a14b40f7d.tar.bz2
fetchmail-06093ccd700f061429f6c5f5118ae36a14b40f7d.zip
Now let's try to resolve the authentication problem.
svn path=/trunk/; revision=3297
Diffstat (limited to 'fetchmail.c')
-rw-r--r--fetchmail.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fetchmail.c b/fetchmail.c
index a62103d1..cbddf07b 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1078,7 +1078,9 @@ static int load_params(int argc, char **argv, int optind)
* We're going to assume the via name is true unless it's
* localhost.
*/
- if (ctl->server.via && strcmp(ctl->server.via, "localhost"))
+ if ((ctl->server.via) &&
+ (!(ctl->localnames && ctl->localnames->next) ||
+ strcmp(ctl->server.via, "localhost")))
ctl->server.queryname = xstrdup(ctl->server.via);
else
ctl->server.queryname = xstrdup(ctl->server.pollname);
@@ -1146,7 +1148,7 @@ static int load_params(int argc, char **argv, int optind)
ctl->server.truename=xstrdup((char *)namerec->h_name);
}
#endif /* HAVE_GETHOSTBYNAME */
- else
+ else if (ctl->active)
{
#ifdef HAVE_GETHOSTBYNAME
struct hostent *namerec;