summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-01-22 23:32:33 +0000
committerTim Potter <tpot@samba.org>2003-01-22 23:32:33 +0000
commitc79eccad91705526c69ff6bca14060718138c570 (patch)
tree66a0c4d8cf982a0737db4bc581d5fa097b3ebea4 /source3/libsmb
parent2ad0d8ccbd616afa839312bca344d17d5ffe20cd (diff)
downloadsamba-c79eccad91705526c69ff6bca14060718138c570.tar.gz
samba-c79eccad91705526c69ff6bca14060718138c570.tar.bz2
samba-c79eccad91705526c69ff6bca14060718138c570.zip
Merge of kerberos changes to make this branch build again!
(This used to be commit 51b319f57f28e3993919d7f3db0251a724902332)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clikrb5.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index c948431509..2047efd704 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -70,54 +70,6 @@
__ERROR__XX__UNKNOWN_ADDRTYPE
#endif
-#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY)
- int create_kerberos_key_from_string(krb5_context context,
- krb5_principal host_princ,
- krb5_data *password,
- krb5_keyblock *key)
-{
- int ret;
- krb5_data salt,
- krb5_encrypt_block eblock;
-
- ret = krb5_principal2salt(context, host_princ, &salt);
- if (ret) {
- DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret)));
- return ret;
- }
- krb5_use_enctype(context, &eblock, ENCTYPE_DES_CBC_MD5);
- return krb5_string_to_key(context, &eblock, key, password, &salt);
-}
-#elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT)
- int create_kerberos_key_from_string(krb5_context context,
- krb5_principal host_princ,
- krb5_data *password,
- krb5_keyblock *key)
-{
- int ret;
- krb5_salt salt;
-
- ret = krb5_get_pw_salt(context, host_princ, &salt);
- if (ret) {
- DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret)));
- return ret;
- }
- return krb5_string_to_key_salt(context, ENCTYPE_DES_CBC_MD5, password->data,
- salt, key);
-}
-#else
- __ERROR_XX_UNKNOWN_CREATE_KEY_FUNCTIONS
-#endif
-
-#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
- krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
- krb5_auth_context auth_context,
- krb5_keyblock *keyblock)
-{
- return krb5_auth_con_setkey(context, auth_context, keyblock);
-}
-#endif
-
/*
we can't use krb5_mk_req because w2k wants the service to be in a particular format
*/