From 811d9003c13ea3de49276f1c07f55f718909be1a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 29 Jul 2010 17:17:49 -0700 Subject: [PATCH] Remove remnants of srvtab support Support for manipulating srvtabs was previously removed, but there were still remnants in command documentation in the ktutil man page and some declared and exported variables for the keytab ops definitions for srvtab manipulation. Remove these additional remnants. Signed-off-by: Love Hornquist Astrand --- admin/ktutil.8 | 30 ------------------------------ lib/krb5/keytab.c | 5 ----- lib/krb5/krb5.h | 2 -- lib/krb5/libkrb5-exports.def.in | 3 --- lib/krb5/version-script.map | 1 - 5 files changed, 41 deletions(-) diff --git a/admin/ktutil.8 b/admin/ktutil.8 index d319ce538..3c1405b3e 100644 --- a/admin/ktutil.8 +++ b/admin/ktutil.8 @@ -161,36 +161,6 @@ Removes all old versions of a key for which there is a newer version that is at least .Ar age (default one week) old. -.It srvconvert -.It srv2keytab Xo -.Op Fl s Ar srvtab -.Op Fl -srvtab= Ns Ar srvtab -.Xc -Converts the version 4 srvtab in -.Ar srvtab -to a version 5 keytab and stores it in -.Ar keytab . -Identical to: -.Bd -ragged -offset indent -.Li ktutil copy -.Li krb4: Ns Ar srvtab -.Ar keytab -.Ed -.It srvcreate -.It key2srvtab Xo -.Op Fl s Ar srvtab -.Op Fl -srvtab= Ns Ar srvtab -.Xc -Converts the version 5 keytab in -.Ar keytab -to a version 4 srvtab and stores it in -.Ar srvtab . -Identical to: -.Bd -ragged -offset indent -.Li ktutil copy -.Ar keytab -.Li krb4: Ns Ar srvtab -.Ed .El .Sh SEE ALSO .Xr kadmin 8 diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c index 79b079a05..7ba2f9778 100644 --- a/lib/krb5/keytab.c +++ b/lib/krb5/keytab.c @@ -73,11 +73,6 @@ * store the keytab in a AFS keyfile (usually /usr/afs/etc/KeyFile ), * the type's name is AFSKEYFILE. The residual part is a filename. * - * - krb4 - * the keytab is a Kerberos 4 srvtab that is on-the-fly converted to - * a keytab. The type's name is krb4 The residual part is a - * filename. - * * - memory * The keytab is stored in a memory segment. This allows sensitive * and/or temporary data not to be stored on disk. The type's name diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h index ac7ac63a4..c48679eb1 100644 --- a/lib/krb5/krb5.h +++ b/lib/krb5/krb5.h @@ -857,8 +857,6 @@ extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_wrfkt_ops; extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_javakt_ops; extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_mkt_ops; extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_akf_ops; -extern KRB5_LIB_VARIABLE const krb5_kt_ops krb4_fkt_ops; -extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_srvtab_fkt_ops; extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_any_ops; extern KRB5_LIB_VARIABLE const char *krb5_cc_type_api; diff --git a/lib/krb5/libkrb5-exports.def.in b/lib/krb5/libkrb5-exports.def.in index e93a752ab..94c0a4f35 100644 --- a/lib/krb5/libkrb5-exports.def.in +++ b/lib/krb5/libkrb5-exports.def.in @@ -704,9 +704,6 @@ EXPORTS #endif #ifdef HAVE_KCM krb5_kcm_ops DATA -#endif -#ifdef HAVE_KRB4 - krb4_fkt_ops DATA #endif krb5_wrfkt_ops DATA krb5_mkt_ops DATA diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map index 3f26abf80..fbe802724 100644 --- a/lib/krb5/version-script.map +++ b/lib/krb5/version-script.map @@ -698,7 +698,6 @@ HEIMDAL_KRB5_2.0 { krb5_fcc_ops; krb5_scc_ops; krb5_kcm_ops; - krb4_fkt_ops; krb5_wrfkt_ops; krb5_mkt_ops; krb5_akf_ops;