From owner-cvs-all  Wed Jun 20 19:22: 4 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id DA85537B401; Wed, 20 Jun 2001 19:21:57 -0700 (PDT)
	(envelope-from assar@FreeBSD.org)
Received: (from assar@localhost)
	by freefall.freebsd.org (8.11.3/8.11.3) id f5L2LvZ05489;
	Wed, 20 Jun 2001 19:21:57 -0700 (PDT)
	(envelope-from assar)
Message-Id: <200106210221.f5L2LvZ05489@freefall.freebsd.org>
From: Assar Westerlund <assar@FreeBSD.org>
Date: Wed, 20 Jun 2001 19:21:57 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/heimdal/admin ktutil_locl.h src/crypto/heimdal/appl/ftp/ftp
         ftp_locl.h src/crypto/heimdal/kadmin kadmin_locl.h
         src/crypto/heimdal/kdc headers.h src/crypto/heimdal/lib/hdb
         hdb_locl.h src/crypto/heimdal/lib/krb5 crypto.c krb5_locl.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

assar       2001/06/20 19:21:57 PDT

  Modified files:
    crypto/heimdal/admin ktutil_locl.h 
    crypto/heimdal/appl/ftp/ftp ftp_locl.h 
    crypto/heimdal/kadmin kadmin_locl.h 
    crypto/heimdal/kdc   headers.h 
    crypto/heimdal/lib/hdb hdb_locl.h 
    crypto/heimdal/lib/krb5 crypto.c krb5_locl.h 
  Log:
  fix merges from 0.3f
  
  Revision  Changes    Path
  1.5       +7 -3      src/crypto/heimdal/admin/ktutil_locl.h
  1.4       +9 -3      src/crypto/heimdal/appl/ftp/ftp/ftp_locl.h
  1.5       +8 -3      src/crypto/heimdal/kadmin/kadmin_locl.h
  1.5       +5 -1      src/crypto/heimdal/kdc/headers.h
  1.5       +6 -12     src/crypto/heimdal/lib/hdb/hdb_locl.h
  1.5       +490 -250  src/crypto/heimdal/lib/krb5/crypto.c
  1.6       +5 -4      src/crypto/heimdal/lib/krb5/krb5_locl.h


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message