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/admin | |
| 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/admin')
| -rw-r--r-- | crypto/heimdal/admin/ktutil_locl.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/heimdal/admin/ktutil_locl.h b/crypto/heimdal/admin/ktutil_locl.h index 25f7f25..78fe0d1 100644 --- a/crypto/heimdal/admin/ktutil_locl.h +++ b/crypto/heimdal/admin/ktutil_locl.h @@ -32,7 +32,7 @@ */ /* - * $Id: ktutil_locl.h,v 1.14 2001/05/10 15:42:45 assar Exp $ + * $Id: ktutil_locl.h,v 1.17 2001/08/22 20:30:18 assar Exp $ * $FreeBSD$ */ @@ -55,7 +55,7 @@ #include <parse_time.h> #include <roken.h> -#ifdef HAVE_OPENSSL_DES_H +#ifdef HAVE_OPENSSL #include <openssl/des.h> #else #include <des.h> @@ -72,7 +72,8 @@ extern krb5_context context; extern int verbose_flag; extern char *keytab_string; -extern char keytab_buf[256]; + +krb5_keytab ktutil_open_keytab(void); int kt_add (int argc, char **argv); int kt_change (int argc, char **argv); @@ -81,6 +82,7 @@ int kt_get (int argc, char **argv); int kt_list(int argc, char **argv); int kt_purge(int argc, char **argv); int kt_remove(int argc, char **argv); +int kt_rename(int argc, char **argv); int srvconv(int argc, char **argv); int srvcreate(int argc, char **argv); |
