diff options
| author | markm <markm@FreeBSD.org> | 2000-02-24 13:37:41 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-02-24 13:37:41 +0000 |
| commit | be16c6202adb7544b9017594a51ceb85b3b65692 (patch) | |
| tree | 99cb1c3b0b3ade65c05b2c6db8b2125733370631 /crypto/heimdal/appl/ftp | |
| parent | 4d2ec46519fa9f998505f49c57de1b1b3186ee6d (diff) | |
| download | FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.zip FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/heimdal/appl/ftp')
| -rw-r--r-- | crypto/heimdal/appl/ftp/ftp/ftp_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h index 49c2b2f..c0d6cae 100644 --- a/crypto/heimdal/appl/ftp/ftp/ftp_locl.h +++ b/crypto/heimdal/appl/ftp/ftp/ftp_locl.h @@ -32,6 +32,7 @@ */ /* $Id: ftp_locl.h,v 1.34 1999/12/02 16:58:29 joda Exp $ */ +/* $FreeBSD$ */ #ifndef __FTP_LOCL_H__ #define __FTP_LOCL_H__ @@ -129,7 +130,7 @@ struct hostent *gethostbyname(const char *); #include "roken.h" #include "security.h" -#include <des.h> /* for des_read_pw_string */ +#include <openssl/des.h> /* for des_read_pw_string */ #if defined(__sun__) && !defined(__svr4) int fclose(FILE*); |
