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-ntp.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-ntp.c')
| -rw-r--r-- | contrib/tcpdump/print-ntp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-ntp.c b/contrib/tcpdump/print-ntp.c index a625f3f..9e8ccfa 100644 --- a/contrib/tcpdump/print-ntp.c +++ b/contrib/tcpdump/print-ntp.c @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.41 2004/01/28 14:54:50 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.41.2.1 2005/05/06 07:57:18 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -135,7 +135,8 @@ ntp_print(register const u_char *cp, u_int length) break; case PRIM_REF: - fn_printn((u_char *)&(bp->refid), 4, NULL); + if (fn_printn((u_char *)&(bp->refid), 4, snapend)) + goto trunc; break; case INFO_QUERY: |
