aboutsummaryrefslogtreecommitdiffstats
path: root/fetchmail.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-01-14 00:07:17 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-01-14 00:07:17 +0000
commitbe9c9f0a5b6d598fb9eeb8e4d2d2cfef367dd759 (patch)
treec68d0c994f53077aefc4a95535eb4093b5473c55 /fetchmail.c
parent7d64feadc43b9051bc7d5f8c638d52539f91c7f6 (diff)
downloadfetchmail-be9c9f0a5b6d598fb9eeb8e4d2d2cfef367dd759.tar.gz
fetchmail-be9c9f0a5b6d598fb9eeb8e4d2d2cfef367dd759.tar.bz2
fetchmail-be9c9f0a5b6d598fb9eeb8e4d2d2cfef367dd759.zip
Move as much stuff into server data as possible.
svn path=/trunk/; revision=756
Diffstat (limited to 'fetchmail.c')
-rw-r--r--fetchmail.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fetchmail.c b/fetchmail.c
index c2169bfc..7a1ed4d7 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -480,8 +480,8 @@ int main (int argc, char **argv)
}
else
{
- free(ctl->canonical_name);
- ctl->canonical_name = xstrdup((char *)namerec->h_name);
+ free(ctl->server.canonical_name);
+ ctl->server.canonical_name = xstrdup((char *)namerec->h_name);
}
}
#endif /* HAVE_GETHOSTBYNAME */
@@ -642,10 +642,10 @@ static int load_params(int argc, char **argv, int optind)
for (mp = querylist; mp && mp != ctl; mp = mp->next)
if (strcmp(mp->server.names->id, ctl->server.names->id) == 0)
{
- ctl->lead_server = mp->lead_server;
+ ctl->server.lead_server = mp->server.lead_server;
goto no_new_server;
}
- ctl->lead_server = ctl;
+ ctl->server.lead_server = &(ctl->server);
no_new_server:;
/* plug in the semi-standard way of indicating a mail address */
@@ -799,8 +799,8 @@ void dump_params (struct query *ctl)
printf("Options for retrieving from %s@%s:\n",
ctl->remotename, visbuf(ctl->server.names->id));
#ifdef HAVE_GETHOSTBYNAME
- if (ctl->canonical_name)
- printf(" Canonical DNS name of server is %s.\n", ctl->canonical_name);
+ if (ctl->server.canonical_name)
+ printf(" Canonical DNS name of server is %s.\n", ctl->server.canonical_name);
#endif /* HAVE_GETHOSTBYNAME */
if (ctl->server.names->next)
{