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/kadmin | |
| parent | 4d2ec46519fa9f998505f49c57de1b1b3186ee6d (diff) | |
| download | FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.zip FreeBSD-src-be16c6202adb7544b9017594a51ceb85b3b65692.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/heimdal/kadmin')
| -rw-r--r-- | crypto/heimdal/kadmin/kadmin_locl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h index 5369254..aa5ba13 100644 --- a/crypto/heimdal/kadmin/kadmin_locl.h +++ b/crypto/heimdal/kadmin/kadmin_locl.h @@ -33,6 +33,7 @@ /* * $Id: kadmin_locl.h,v 1.25 2000/02/06 05:16:35 assar Exp $ + * $FreeBSD$ */ #ifndef __ADMIN_LOCL_H__ @@ -73,7 +74,7 @@ #endif #include <err.h> #include <roken.h> -#include <des.h> +#include <openssl/des.h> #include <krb5.h> #include <hdb.h> #include <hdb_err.h> |
