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/kdc | |
| parent | 4d2ec46519fa9f998505f49c57de1b1b3186ee6d (diff) | |
| download | FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.zip FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/heimdal/kdc')
| -rw-r--r-- | crypto/heimdal/kdc/headers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h index 845b2a5..118e0d8 100644 --- a/crypto/heimdal/kdc/headers.h +++ b/crypto/heimdal/kdc/headers.h @@ -33,6 +33,7 @@ /* * $Id: headers.h,v 1.6 2000/02/06 06:04:36 assar Exp $ + * $FreeBSD$ */ #ifndef __HEADERS_H__ @@ -79,7 +80,7 @@ #include <getarg.h> #include <base64.h> #include <parse_units.h> -#include <des.h> +#include <openssl/des.h> #include <krb5.h> #include <hdb.h> #include <hdb_err.h> |
