diff options
| author | assar <assar@FreeBSD.org> | 2001-06-21 02:21:57 +0000 |
|---|---|---|
| committer | assar <assar@FreeBSD.org> | 2001-06-21 02:21:57 +0000 |
| commit | c05dadd8324d3befaaa8bf5972a638fab840e9b4 (patch) | |
| tree | e6871833948536990e13646ceb0b0e09e8827e19 /crypto/heimdal/admin | |
| parent | 7281f9682138be213c08fe4674685b925aef5ead (diff) | |
| download | FreeBSD-src-c05dadd8324d3befaaa8bf5972a638fab840e9b4.zip FreeBSD-src-c05dadd8324d3befaaa8bf5972a638fab840e9b4.tar.gz | |
fix merges from 0.3f
Diffstat (limited to 'crypto/heimdal/admin')
| -rw-r--r-- | crypto/heimdal/admin/ktutil_locl.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h index 7794294..25f7f25 100644 --- a/crypto/heimdal/admin/ktutil_locl.h +++ b/crypto/heimdal/admin/ktutil_locl.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: ktutil_locl.h,v 1.11 2000/02/07 04:26:37 assar Exp $ + * $Id: ktutil_locl.h,v 1.14 2001/05/10 15:42:45 assar Exp $ * $FreeBSD$ */ @@ -55,7 +55,11 @@ #include <parse_time.h> #include <roken.h> +#ifdef HAVE_OPENSSL_DES_H #include <openssl/des.h> +#else +#include <des.h> +#endif #include <krb5.h> #include <kadm5/admin.h> @@ -65,10 +69,10 @@ #include <getarg.h> extern krb5_context context; -extern krb5_keytab keytab; extern int verbose_flag; extern char *keytab_string; +extern char keytab_buf[256]; int kt_add (int argc, char **argv); int kt_change (int argc, char **argv); |
