diff options
| author | Sam Hartman <hartmans@mit.edu> | 2010-01-04 19:59:16 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2010-01-04 19:59:16 +0000 |
| commit | 4c34730708c404e93920b2afc4f00e91f617497a (patch) | |
| tree | 0a3484c17fffb10f2ba101d6940e04da4ac6c466 /src/include | |
| parent | ac91c2f4c88ec96f1b058a7c7547c0e386a5e048 (diff) | |
| download | krb5-4c34730708c404e93920b2afc4f00e91f617497a.tar.gz krb5-4c34730708c404e93920b2afc4f00e91f617497a.tar.xz krb5-4c34730708c404e93920b2afc4f00e91f617497a.zip | |
Bring back krb5_kt_free_entry which really does the same thing as
krb5_free_keytab_entry_contents per discussion on krbdev in order to
avoid breaking samba builds.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23581 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 4 | ||||
| -rw-r--r-- | src/include/krb5/krb5.hin | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 8a37e08e10..43b780ed0b 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -2607,10 +2607,6 @@ krb5_error_code krb5_generate_seq_number(krb5_context, const krb5_keyblock *, krb5_error_code KRB5_CALLCONV krb5_kt_register(krb5_context, const struct _krb5_kt_ops *); -/* use krb5_free_keytab_entry_contents instead */ -krb5_error_code KRB5_CALLCONV krb5_kt_free_entry(krb5_context, - krb5_keytab_entry * ); - krb5_error_code krb5_principal2salt_norealm(krb5_context, krb5_const_principal, krb5_data *); diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin index 76aef56594..09412738ac 100644 --- a/src/include/krb5/krb5.hin +++ b/src/include/krb5/krb5.hin @@ -1816,6 +1816,11 @@ krb5_kt_default(krb5_context, krb5_keytab * ); krb5_error_code KRB5_CALLCONV krb5_free_keytab_entry_contents(krb5_context, krb5_keytab_entry *); +/* use krb5_free_keytab_entry_contents instead; this does the same thing but is + * misnamed and retained for backward compatability.*/ +krb5_error_code KRB5_CALLCONV krb5_kt_free_entry(krb5_context, + krb5_keytab_entry * ); + /* remove and add are functions, so that they can return NOWRITE if not a writable keytab */ krb5_error_code KRB5_CALLCONV |