From owner-cvs-all@FreeBSD.ORG  Tue Jul 20 15:18:32 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 46D9916A4CE; Tue, 20 Jul 2004 15:18:32 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 27BF443D39; Tue, 20 Jul 2004 15:18:32 +0000 (GMT)
	(envelope-from roberto@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6KFIVmp097951;
	Tue, 20 Jul 2004 15:18:32 GMT
	(envelope-from roberto@repoman.freebsd.org)
Received: (from roberto@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6KFIVgK097950;
	Tue, 20 Jul 2004 15:18:31 GMT
	(envelope-from roberto)
Message-Id: <200407201518.i6KFIVgK097950@repoman.freebsd.org>
From: Ollivier Robert <roberto@FreeBSD.org>
Date: Tue, 20 Jul 2004 15:18:31 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/ntp/ntpd ntp_control.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jul 2004 15:18:32 -0000

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