← Back to branch summary

~ubuntu-branches/ubuntu/hardy/exim4/hardy-proposed

« back to all changes in this revision

Viewing changes to src/routers/rf_lookup_hostlist.c

  • Committer: Bazaar Package Importer
  • Author(s): Marc Haber
  • Date: 2005-07-02 06:08:34 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050702060834-qk17pd52kb9nt3bj
Tags: 4.52-1
http://bugs.debian.org/315775
* new upstream version 4.51. (mh)
  * adapt 70_remove_exim-users_references
  * remove 37_gnutlsparams
  * adapt 36_pcre
  * adapt 31_eximmanpage
* fix package priorities to have them in sync with override again. (mh)
* Fix error in nb (Norwegian) translation.
  Thanks to Helge Hafting. (mh). Closes: #315775
* Standards-Version: 3.6.2, no changes needed. (mh)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/routers/rf_lookup_hostlist.c
 
1
/* $Cambridge: exim/exim-src/src/routers/rf_lookup_hostlist.c,v 1.3 2005/01/11 15:51:03 ph10 Exp $ */
 
2
 
1
3
/*************************************************
2
4
*     Exim - an Internet mail transport agent    *
3
5
*************************************************/
4
6
 
5
 
/* Copyright (c) University of Cambridge 1995 - 2004 */
 
7
/* Copyright (c) University of Cambridge 1995 - 2005 */
6
8
/* See the file NOTICE for conditions of use and distribution. */
7
9
 
8
10
 
81
83
        ignore_target_hosts,
82
84
        HOST_FIND_BY_MX,                /* look only for MX records */
83
85
        NULL,                           /* SRV service not relevant */
84
 
        FALSE,                          /* qualify_single */
85
 
        FALSE,                          /* search_parents */
 
86
        NULL,                           /* failing srv domains not relevant */
 
87
        NULL,                           /* no special mx failing domains */
86
88
        NULL,                           /* fully_qualified_name */
87
89
        NULL);                          /* indicate local host removed */
88
90
    }
90
92
  /* If explicitly configured to look up by name, or if the "host name" is
91
93
  actually an IP address, do a byname lookup. */
92
94
 
93
 
  else if (lookup_type == lk_byname || string_is_ip_address(h->name, NULL))
 
95
  else if (lookup_type == lk_byname || string_is_ip_address(h->name, NULL) > 0)
94
96
    {
95
97
    DEBUG(D_route|D_host_lookup) debug_printf("calling host_find_byname\n");
96
98
    rc = host_find_byname(h, ignore_target_hosts, &canonical_name, TRUE);
104
106
    {
105
107
    BOOL removed;
106
108
    DEBUG(D_route|D_host_lookup) debug_printf("doing DNS lookup\n");
107
 
    rc = host_find_bydns(h, ignore_target_hosts, HOST_FIND_BY_A, NULL, FALSE,
108
 
      FALSE, &canonical_name, &removed);
 
109
    rc = host_find_bydns(h, ignore_target_hosts, HOST_FIND_BY_A, NULL, NULL,
 
110
      NULL, &canonical_name, &removed);
109
111
    if (rc == HOST_FOUND)
110
112
      {
111
113
      if (removed) setflag(addr, af_local_host_removed);