From owner-cvs-libexec  Sat May 10 12:49:12 1997
Return-Path: <owner-cvs-libexec>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id MAA18726
          for cvs-libexec-outgoing; Sat, 10 May 1997 12:49:12 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA18686;
          Sat, 10 May 1997 12:48:44 -0700 (PDT)
From: David Nugent <davidn@FreeBSD.ORG>
Received: (from davidn@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id MAA29704;
	Sat, 10 May 1997 12:48:13 -0700 (PDT)
Date: Sat, 10 May 1997 12:48:13 -0700 (PDT)
Message-Id: <199705101948.MAA29704@freefall.freebsd.org>
To: CVS-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-libexec@FreeBSD.ORG
Subject: cvs commit:  src/libexec/ftpd Makefile ftpd.8 ftpd.c skey-stuff.c
Sender: owner-cvs-libexec@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

davidn      97/05/10 12:48:13

  Branch:      libexec/ftpd  RELENG_2_2
  Modified:    libexec/ftpd  Makefile ftpd.8 ftpd.c skey-stuff.c
  Log:
  Merge from current: adds login.conf support & bugfix mmap failure.
  
  Revision  Changes    Path
  1.17.2.3  +2 -2      src/libexec/ftpd/Makefile
  1.9.2.8   +5 -1      src/libexec/ftpd/ftpd.8
  1.25.2.8  +51 -5     src/libexec/ftpd/ftpd.c
  1.6.2.1   +2 -1      src/libexec/ftpd/skey-stuff.c