diff options
author | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2005-07-11 04:14:02 +0000 |
commit | 5d66575dd923625f5f8a569b19801db44c111619 (patch) | |
tree | 14f508983141729f86ce893b1f31e0d11cf1b4db /contrib/tcpdump/print-domain.c | |
parent | fb0e3fc91b71a7c77c12753c471331fc4757d33c (diff) | |
download | FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.zip FreeBSD-src-5d66575dd923625f5f8a569b19801db44c111619.tar.gz |
resolve merge conflicts
Approved by: re (scottl)
Diffstat (limited to 'contrib/tcpdump/print-domain.c')
-rw-r--r-- | contrib/tcpdump/print-domain.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c index 0013006..08b5cea 100644 --- a/contrib/tcpdump/print-domain.c +++ b/contrib/tcpdump/print-domain.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89 2004/03/23 19:03:03 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.89.2.1 2005/04/20 20:59:00 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -133,9 +133,10 @@ labellen(const u_char *cp) i = *cp; if ((i & INDIR_MASK) == EDNS0_MASK) { int bitlen, elt; - - if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) + if ((elt = (i & ~INDIR_MASK)) != EDNS0_ELT_BITLABEL) { + printf("<ELT %d>", elt); return(-1); + } if (!TTEST2(*(cp + 1), 1)) return(-1); if ((bitlen = *(cp + 1)) == 0) |