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/admin | |
| parent | 4d2ec46519fa9f998505f49c57de1b1b3186ee6d (diff) | |
| download | FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.zip FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/heimdal/admin')
| -rw-r--r-- | crypto/heimdal/admin/ktutil_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h index a9f41b5..030ec1f 100644 --- a/crypto/heimdal/admin/ktutil_locl.h +++ b/crypto/heimdal/admin/ktutil_locl.h @@ -33,6 +33,7 @@ /* * $Id: ktutil_locl.h,v 1.11 2000/02/07 04:26:37 assar Exp $ + * $FreeBSD$ */ #ifndef __KTUTIL_LOCL_H__ @@ -53,7 +54,7 @@ #endif #include <roken.h> -#include <des.h> +#include <openssl/des.h> #include <krb5.h> #include <kadm5/admin.h> |
