diff options
| author | nectar <nectar@FreeBSD.org> | 2002-02-19 15:50:30 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-02-19 15:50:30 +0000 |
| commit | 25f2aedbddff7020a6dcd9a492b9f58d9ed89659 (patch) | |
| tree | 8280c4785ea3d71e6c69f6c5c40d2f95e4fb0bba /crypto/heimdal/kdc | |
| parent | 4691b92e66711538fc5179e2f57bbadd05d55764 (diff) | |
| download | FreeBSD-src-25f2aedbddff7020a6dcd9a492b9f58d9ed89659.zip FreeBSD-src-25f2aedbddff7020a6dcd9a492b9f58d9ed89659.tar.gz | |
Resolve conflicts after import of Heimdal Kerberos 2002/02/17.
Diffstat (limited to 'crypto/heimdal/kdc')
| -rw-r--r-- | crypto/heimdal/kdc/headers.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/heimdal/kdc/headers.h b/crypto/heimdal/kdc/headers.h index ce0f132..2ae8d09 100644 --- a/crypto/heimdal/kdc/headers.h +++ b/crypto/heimdal/kdc/headers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -32,7 +32,7 @@ */ /* - * $Id: headers.h,v 1.11 2001/02/15 04:20:53 assar Exp $ + * $Id: headers.h,v 1.13 2001/08/22 20:30:25 assar Exp $ * $FreeBSD$ */ @@ -78,12 +78,15 @@ #ifdef HAVE_UTIL_H #include <util.h> #endif +#ifdef HAVE_LIBUTIL_H +#include <libutil.h> +#endif #include <err.h> #include <roken.h> #include <getarg.h> #include <base64.h> #include <parse_units.h> -#ifdef HAVE_OPENSSL_DES_H +#ifdef HAVE_OPENSSL #include <openssl/des.h> #else #include <des.h> |
