diff options
| author | nectar <nectar@FreeBSD.org> | 2002-09-16 21:07:11 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-09-16 21:07:11 +0000 |
| commit | ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877 (patch) | |
| tree | ca9493c028253b7988c291da5839cb536b72c540 /crypto/heimdal/kadmin | |
| parent | a876cfedd88823d520688032e9bde83b68098a88 (diff) | |
| download | FreeBSD-src-ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877.zip FreeBSD-src-ed53d8e233c6bc5f6ab5b83a9ab284dea0e65877.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/heimdal/kadmin')
| -rw-r--r-- | crypto/heimdal/kadmin/kadmin_locl.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/crypto/heimdal/kadmin/kadmin_locl.h b/crypto/heimdal/kadmin/kadmin_locl.h index cfa20f4..0b36127 100644 --- a/crypto/heimdal/kadmin/kadmin_locl.h +++ b/crypto/heimdal/kadmin/kadmin_locl.h @@ -32,7 +32,7 @@ */ /* - * $Id: kadmin_locl.h,v 1.40 2001/08/22 20:30:24 assar Exp $ + * $Id: kadmin_locl.h,v 1.41 2002/09/10 20:04:45 joda Exp $ * $FreeBSD$ */ @@ -87,11 +87,6 @@ #endif #include <err.h> #include <roken.h> -#ifdef HAVE_OPENSSL -#include <openssl/des.h> -#else -#include <des.h> -#endif #include <krb5.h> #include <krb5_locl.h> #include <hdb.h> |
