X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=checkalias.c;h=6437db4c7c7f979b535e564bc9e5859fb7a583b2;hb=87bcf29364c4640edb87cc2186b965d1a564d70c;hp=2e50ea09222d3cd61b469b953839e41a6665c027;hpb=b5737df8b9eef8a7001432c1f88a7dcacf2e56a8;p=~andy%2Ffetchmail diff --git a/checkalias.c b/checkalias.c index 2e50ea09..6437db4c 100644 --- a/checkalias.c +++ b/checkalias.c @@ -9,90 +9,12 @@ #include #include #include -#ifdef HAVE_NET_SOCKET_H -#include -#else -#include -#endif -#include -#ifdef HAVE_ARPA_INET_H -#include -#endif -#include -#include "i18n.h" -#include "mx.h" -#include "fetchmail.h" -#include "getaddrinfo.h" - -#define MX_RETRIES 3 - -typedef unsigned char address_t[sizeof (struct in_addr)]; - -#ifdef HAVE_RES_SEARCH -static int getaddresses(struct addrinfo **result, const char *name) -{ - struct addrinfo hints; - - memset(&hints, 0, sizeof(hints)); - hints.ai_socktype=SOCK_STREAM; - hints.ai_protocol=PF_UNSPEC; - hints.ai_family=AF_UNSPEC; - return fm_getaddrinfo(name, NULL, &hints, result); -} - -/* XXX FIXME: doesn't detect if an IPv6-mapped IPv4 address - * matches a real IPv4 address */ -static int compareaddr(const struct addrinfo *a1, const struct addrinfo *a2) -{ - if (a1->ai_family != a2->ai_family) return FALSE; - if (a1->ai_addrlen != a2->ai_addrlen) return FALSE; - return (!memcmp(a1->ai_addr, a2->ai_addr, a1->ai_addrlen)); -} - -static int is_ip_alias(const char *name1,const char *name2) -/* - * Given two hostnames as arguments, returns TRUE if they - * have at least one IP address in common. - * No check is done on errors returned by gethostbyname, - * the calling function does them. - */ -{ - int rc = FALSE; - struct addrinfo *res1 = NULL, *res2 = NULL, *ii, *ij; - - if (getaddresses(&res1, name1)) - goto found; - - if (getaddresses(&res2, name2)) - goto found; - - for (ii = res1 ; ii ; ii = ii -> ai_next) { - for (ij = res2 ; ij ; ij = ij -> ai_next) { - if (compareaddr(ii, ij)) { - rc = TRUE; - goto found; - } - } - } - -found: - if (res2) - fm_freeaddrinfo(res2); - if (res1) - fm_freeaddrinfo(res1); - return rc; -} -#endif +#include "fetchmail.h" int is_host_alias(const char *name, struct query *ctl, struct addrinfo **res) /* determine whether name is a DNS alias of the mailserver for this query */ { -#ifdef HAVE_RES_SEARCH - struct mxentry *mxp, *mxrecords; - int e; - struct addrinfo hints, *res_st; -#endif struct idlist *idl; size_t namelen; @@ -146,103 +68,8 @@ int is_host_alias(const char *name, struct query *ctl, struct addrinfo **res) if (!ctl->server.dns) return(FALSE); -#ifndef HAVE_RES_SEARCH (void)res; return(FALSE); -#else - /* - * The only code that calls the BIND library is here and in the - * start-of-run probe with gethostbyname(3) under ETRN/Kerberos. - * - * We know DNS service was up at the beginning of the run. - * If it's down, our nameserver has crashed. We don't want to try - * delivering the current message or anything else from the - * current server until it's back up. - */ - memset(&hints, 0, sizeof hints); - hints.ai_family=AF_UNSPEC; - hints.ai_protocol=PF_UNSPEC; - hints.ai_socktype=SOCK_STREAM; - hints.ai_flags=AI_CANONNAME; - - e = fm_getaddrinfo(name, NULL, &hints, res); - if (e == 0) - { - int rr = (strcasecmp(ctl->server.truename, (*res)->ai_canonname) == 0); - fm_freeaddrinfo(*res); *res = NULL; - if (rr) - goto match; - else if (ctl->server.checkalias && 0 == fm_getaddrinfo(ctl->server.truename, NULL, &hints, &res_st)) - { - fm_freeaddrinfo(res_st); - if (outlevel >= O_DEBUG) - report(stdout, GT_("Checking if %s is really the same node as %s\n"),ctl->server.truename,name); - if (is_ip_alias(ctl->server.truename,name) == TRUE) - { - if (outlevel >= O_DEBUG) - report(stdout, GT_("Yes, their IP addresses match\n")); - goto match; - } - if (outlevel >= O_DEBUG) - report(stdout, GT_("No, their IP addresses don't match\n")); - return(FALSE); - } else { - return(FALSE); - } - } - else - switch (e) - { - case EAI_NONAME: /* specified host is unknown */ - break; - - default: - if (outlevel != O_SILENT) - report_complete(stdout, "\n"); /* terminate the progress message */ - report(stderr, - GT_("nameserver failure while looking for '%s' during poll of %s: %s\n"), - name, ctl->server.pollname, gai_strerror(e)); - ctl->errcount++; - break; - } - - /* - * We're only here if DNS was OK but the gethostbyname() failed - * with a HOST_NOT_FOUND or NO_ADDRESS error. - * Search for a name match on MX records pointing to the server. - */ - h_errno = 0; - if ((mxrecords = getmxrecords(name)) == (struct mxentry *)NULL) - { - switch (h_errno) - { - case HOST_NOT_FOUND: /* specified host is unknown */ -#ifdef NO_ADDRESS - case NO_ADDRESS: /* valid, but does not have an IP address */ - return(FALSE); -#endif - case NO_RECOVERY: /* non-recoverable name server error */ - case TRY_AGAIN: /* temporary error on authoritative server */ - default: - report(stderr, - GT_("nameserver failure while looking for `%s' during poll of %s.\n"), - name, ctl->server.pollname); - ctl->errcount++; - break; - } - } else { - for (mxp = mxrecords; mxp->name; mxp++) - if (strcasecmp(ctl->server.truename, mxp->name) == 0 - || is_ip_alias(ctl->server.truename, mxp->name) == TRUE) - goto match; - return(FALSE); - match:; - } - - /* add this name to relevant server's `also known as' list */ - save_str(&lead_server->akalist, name, 0); - return(TRUE); -#endif /* HAVE_RES_SEARCH */ } /* checkalias.c ends here */