diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-03-12 18:29:57 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-04-03 17:47:32 +0200 |
| commit | b1c4f1ddfc6711463b40b8d09bbda0d1ecc676db (patch) | |
| tree | 9c5db8891cdf5d61486904488676aead8376d434 | |
| parent | cf30feef165b8fae2e39fe7cb68ff545b81d7b1d (diff) | |
| download | samba-b1c4f1ddfc6711463b40b8d09bbda0d1ecc676db.tar.gz samba-b1c4f1ddfc6711463b40b8d09bbda0d1ecc676db.tar.bz2 samba-b1c4f1ddfc6711463b40b8d09bbda0d1ecc676db.zip | |
s3-krb5: Remove unused krb5_rd_req_return_keyblock_from_keytab
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/include/krb5_protos.h | 8 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 55 |
2 files changed, 0 insertions, 63 deletions
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h index 9481e7ce3b..f3fcb619d5 100644 --- a/source3/include/krb5_protos.h +++ b/source3/include/krb5_protos.h @@ -81,14 +81,6 @@ 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 krb5_rd_req_return_keyblock_from_keytab(krb5_context context, - krb5_auth_context *auth_context, - const krb5_data *inbuf, - krb5_const_principal server, - krb5_keytab keytab, - krb5_flags *ap_req_options, - krb5_ticket **ticket, - krb5_keyblock **keyblock); 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 9f760b6ca5..5183b083fc 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -913,61 +913,6 @@ out: return KRB5KDC_ERR_BADOPTION; } - krb5_error_code krb5_rd_req_return_keyblock_from_keytab(krb5_context context, - krb5_auth_context *auth_context, - const krb5_data *inbuf, - krb5_const_principal server, - krb5_keytab keytab, - krb5_flags *ap_req_options, - krb5_ticket **ticket, - krb5_keyblock **keyblock) -{ - krb5_error_code ret; - krb5_kvno kvno; - krb5_enctype enctype; - krb5_keyblock *local_keyblock; - - ret = krb5_rd_req(context, - auth_context, - inbuf, - server, - keytab, - ap_req_options, - ticket); - if (ret) { - return ret; - } - -#ifdef KRB5_TICKET_HAS_KEYINFO - enctype = (*ticket)->enc_part.enctype; - kvno = (*ticket)->enc_part.kvno; -#else - ret = smb_krb5_get_keyinfo_from_ap_req(context, inbuf, &kvno, &enctype); - if (ret) { - return ret; - } -#endif - - ret = get_key_from_keytab(context, - server, - enctype, - kvno, - &local_keyblock); - if (ret) { - DEBUG(0,("krb5_rd_req_return_keyblock_from_keytab: failed to call get_key_from_keytab\n")); - goto out; - } - -out: - if (ret && local_keyblock != NULL) { - krb5_free_keyblock(context, local_keyblock); - } else { - *keyblock = local_keyblock; - } - - return ret; -} - 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 */ |