Date: Tue, 20 Jul 2004 15:18:31 +0000 (UTC) From: Ollivier Robert <roberto@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/ntp/ntpd ntp_control.c Message-ID: <200407201518.i6KFIVgK097950@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
roberto 2004-07-20 15:18:31 UTC
FreeBSD src repository
Modified files:
contrib/ntp/ntpd ntp_control.c
Log:
Merge conflicts (see also previous commit).
Reinsert our local changes to ntp_control.c:
1.4: Do not log every potential exploit attempt since a denial-of-service
may result
1.5: int -> unsigned char fixes
Revision Changes Path
1.8 +173 -151 src/contrib/ntp/ntpd/ntp_control.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407201518.i6KFIVgK097950>