Deleted Added
full compact
domain.c (98121) domain.c (102528)
1/*
2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1986, 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
12 */
13
14#include <sendmail.h>
15
16#if NAMED_BIND
1/*
2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
3 * All rights reserved.
4 * Copyright (c) 1986, 1995-1997 Eric P. Allman. All rights reserved.
5 * Copyright (c) 1988, 1993
6 * The Regents of the University of California. All rights reserved.
7 *
8 * By using this file, you agree to the terms and conditions set
9 * forth in the LICENSE file which can be found at the top level of
10 * the sendmail distribution.
11 *
12 */
13
14#include <sendmail.h>
15
16#if NAMED_BIND
17SM_RCSID("@(#)$Id: domain.c,v 8.181 2002/05/24 23:48:42 gshapiro Exp $ (with name server)")
17SM_RCSID("@(#)$Id: domain.c,v 8.181.2.1 2002/06/27 16:55:04 ca Exp $ (with name server)")
18#else /* NAMED_BIND */
18#else /* NAMED_BIND */
19SM_RCSID("@(#)$Id: domain.c,v 8.181 2002/05/24 23:48:42 gshapiro Exp $ (without name server)")
19SM_RCSID("@(#)$Id: domain.c,v 8.181.2.1 2002/06/27 16:55:04 ca Exp $ (without name server)")
20#endif /* NAMED_BIND */
21
22#if NAMED_BIND
23
24# include <arpa/inet.h>
25
26
27/*

--- 631 unchanged lines hidden (view full) ---

659#if _FFR_BESTMX_BETTER_TRUNCATION
660 char *buf;
661#else /* _FFR_BESTMX_BETTER_TRUNCATION */
662 char *p;
663 char buf[PSBUFSIZE / 2];
664#endif /* _FFR_BESTMX_BETTER_TRUNCATION */
665
666 _res.options &= ~(RES_DNSRCH|RES_DEFNAMES);
20#endif /* NAMED_BIND */
21
22#if NAMED_BIND
23
24# include <arpa/inet.h>
25
26
27/*

--- 631 unchanged lines hidden (view full) ---

659#if _FFR_BESTMX_BETTER_TRUNCATION
660 char *buf;
661#else /* _FFR_BESTMX_BETTER_TRUNCATION */
662 char *p;
663 char buf[PSBUFSIZE / 2];
664#endif /* _FFR_BESTMX_BETTER_TRUNCATION */
665
666 _res.options &= ~(RES_DNSRCH|RES_DEFNAMES);
667 nmx = getmxrr(name, mxhosts, NULL, false, statp, true, NULL);
667 nmx = getmxrr(name, mxhosts, NULL, false, statp, false, NULL);
668 _res.options = saveopts;
669 if (nmx <= 0)
670 return NULL;
671 if (bitset(MF_MATCHONLY, map->map_mflags))
672 return map_rewrite(map, name, strlen(name), NULL);
673 if ((map->map_coldelim == '\0') || (nmx == 1))
674 return map_rewrite(map, mxhosts[0], strlen(mxhosts[0]), av);
675

--- 573 unchanged lines hidden ---
668 _res.options = saveopts;
669 if (nmx <= 0)
670 return NULL;
671 if (bitset(MF_MATCHONLY, map->map_mflags))
672 return map_rewrite(map, name, strlen(name), NULL);
673 if ((map->map_coldelim == '\0') || (nmx == 1))
674 return map_rewrite(map, mxhosts[0], strlen(mxhosts[0]), av);
675

--- 573 unchanged lines hidden ---