diff options
| author | nectar <nectar@FreeBSD.org> | 2002-02-19 15:50:30 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-02-19 15:50:30 +0000 |
| commit | 25f2aedbddff7020a6dcd9a492b9f58d9ed89659 (patch) | |
| tree | 8280c4785ea3d71e6c69f6c5c40d2f95e4fb0bba /crypto/heimdal/appl | |
| parent | 4691b92e66711538fc5179e2f57bbadd05d55764 (diff) | |
| download | FreeBSD-src-25f2aedbddff7020a6dcd9a492b9f58d9ed89659.zip FreeBSD-src-25f2aedbddff7020a6dcd9a492b9f58d9ed89659.tar.gz | |
Resolve conflicts after import of Heimdal Kerberos 2002/02/17.
Diffstat (limited to 'crypto/heimdal/appl')
| -rw-r--r-- | crypto/heimdal/appl/ftp/ftp/ftp_locl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h index 63dc1dd..a729d0c 100644 --- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h +++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan + * Copyright (c) 1995 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: ftp_locl.h,v 1.35 2001/02/15 04:20:51 assar Exp $ */ +/* $Id: ftp_locl.h,v 1.36 2001/08/22 20:30:19 assar Exp $ */ /* $FreeBSD$ */ #ifndef __FTP_LOCL_H__ @@ -132,7 +132,7 @@ struct hostent *gethostbyname(const char *); #include "security.h" /* des_read_pw_string */ -#ifdef HAVE_OPENSSL_DES_H +#ifdef HAVE_OPENSSL #include <openssl/des.h> #else #include <des.h> |
