From owner-cvs-all@FreeBSD.ORG  Wed Aug 18 06:29:48 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 AE41716A4CE; Wed, 18 Aug 2004 06:29:48 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A3B9543D49; Wed, 18 Aug 2004 06:29:48 +0000 (GMT)
	(envelope-from obrien@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 i7I6TmQh030722;
	Wed, 18 Aug 2004 06:29:48 GMT
	(envelope-from obrien@repoman.freebsd.org)
Received: (from obrien@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7I6Tmm2030721;
	Wed, 18 Aug 2004 06:29:48 GMT
	(envelope-from obrien)
Message-Id: <200408180629.i7I6Tmm2030721@repoman.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 18 Aug 2004 06:29:48 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: LUKEM
Subject: cvs commit: src/contrib/lukemftpd - Imported sources
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: Wed, 18 Aug 2004 06:29:48 -0000

obrien      2004-08-18 06:29:48 UTC

  FreeBSD src repository

  src/contrib/lukemftpd - Imported sources
  Update of /home/ncvs/src/contrib/lukemftpd
  In directory repoman.freebsd.org:/tmp/cvs-serv30683
  
  Log Message:
  Import of LukeM's ftpd taken from the NetBSD CVS repo on 9-Aug-2004.
  This closes the remotely exploitable vulnerability documented at
  ftp://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2004-009.txt.asc
  http://www.vuxml.org/freebsd/c4b025bb-f05d-11d8-9837-000c41e2cdad.html
  
  Status:
  
  Vendor Tag:	LUKEM
  Release Tags:	nbsd_20040809
  		
  U src/contrib/lukemftpd/src/pathnames.h
  U src/contrib/lukemftpd/src/logwtmp.c
  U src/contrib/lukemftpd/src/logutmp.c
  C src/contrib/lukemftpd/src/ftpusers.5
  C src/contrib/lukemftpd/src/ftpd.conf.5
  U src/contrib/lukemftpd/src/version.h
  U src/contrib/lukemftpd/src/ftpd.8
  U src/contrib/lukemftpd/src/ftpcmd.y
  U src/contrib/lukemftpd/src/extern.h
  U src/contrib/lukemftpd/src/conf.c
  U src/contrib/lukemftpd/src/cmds.c
  U src/contrib/lukemftpd/src/Makefile
  C src/contrib/lukemftpd/src/ftpd.c
  U src/contrib/lukemftpd/src/popen.c
  U src/contrib/lukemftpd/libnetbsd/strsuftoll.c
  
  3 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jLUKEM:yesterday -jLUKEM src/contrib/lukemftpd