From 0e2d659c945c000c9c3e29bb23a9fa24b8f59dc3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 12 Mar 2012 18:40:06 +1100 Subject: s3-krb5: Remove unused smb_krb5_get_keyinfo_from_ap_req() Signed-off-by: Stefan Metzmacher --- source3/include/krb5_protos.h | 4 ---- source3/libsmb/clikrb5.c | 26 -------------------------- 2 files changed, 30 deletions(-) diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h index 8ea12705c2..c2d4517665 100644 --- a/source3/include/krb5_protos.h +++ b/source3/include/krb5_protos.h @@ -75,10 +75,6 @@ krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, kr void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype); bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2); void kerberos_free_data_contents(krb5_context context, krb5_data *pdata); -krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, - const krb5_data *inbuf, - krb5_kvno *kvno, - krb5_enctype *enctype); krb5_error_code smb_krb5_parse_name_norealm(krb5_context context, const char *name, krb5_principal *principal); diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 7a1950f755..957557dbf0 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -711,32 +711,6 @@ static krb5_enctype get_enctype_from_ap_req(krb5_ap_req *ap_req) /* Prototypes */ - krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context, - const krb5_data *inbuf, - krb5_kvno *kvno, - krb5_enctype *enctype) -{ -#ifdef HAVE_KRB5_DECODE_AP_REQ /* Heimdal */ - { - krb5_error_code ret; - krb5_ap_req ap_req; - - ret = krb5_decode_ap_req(context, inbuf, &ap_req); - if (ret) - return ret; - - *kvno = get_kvno_from_ap_req(&ap_req); - *enctype = get_enctype_from_ap_req(&ap_req); - - free_AP_REQ(&ap_req); - return 0; - } -#endif - - /* Possibly not an appropriate error code. */ - return KRB5KDC_ERR_BADOPTION; -} - krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, /* FILE:/tmp/krb5cc_0 */ const char *client_string, /* gd@BER.SUSE.DE */ const char *service_string, /* krbtgt/BER.SUSE.DE@BER.SUSE.DE */ -- cgit