diff options
| author | Jeremy Allison <jra@samba.org> | 2003-01-21 20:43:26 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-01-21 20:43:26 +0000 |
| commit | e545fe3c0aa1901026d5d11fa48d084e4cecde40 (patch) | |
| tree | 9569f37afb5001f88391514c572b47e1ff89ea2e /source3/libads | |
| parent | 85ecf66547e8e86bfd9726d7a08a67cb37672b30 (diff) | |
| download | samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.tar.gz samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.tar.bz2 samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.zip | |
Get closer to Heimdal compile... Damn. HEAD has different code in
kerberos_verify...
Jeremy.
(This used to be commit e8c4098da619a1429cc4c8251761333a7c0f3458)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/kerberos_verify.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c index f761467d6f..379525a8e3 100644 --- a/source3/libads/kerberos_verify.c +++ b/source3/libads/kerberos_verify.c @@ -36,8 +36,6 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket, krb5_keytab keytab = NULL; krb5_data packet; krb5_ticket *tkt = NULL; - krb5_data salt; - krb5_encrypt_block eblock; int ret; krb5_keyblock * key; krb5_principal host_princ; @@ -91,24 +89,15 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket, return NT_STATUS_LOGON_FAILURE; } - ret = krb5_principal2salt(context, host_princ, &salt); - if (ret) { - DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret))); - return NT_STATUS_LOGON_FAILURE; - } - if (!(key = (krb5_keyblock *)malloc(sizeof(*key)))) { return NT_STATUS_NO_MEMORY; } - krb5_use_enctype(context, &eblock, ENCTYPE_DES_CBC_MD5); - - ret = krb5_string_to_key(context, &eblock, key, &password, &salt); - if (ret) { - DEBUG(1,("krb5_string_to_key failed (%s)\n", error_message(ret))); + if (create_kerberos_key_from_string(context, host_princ, &password, key)) { + SAFE_FREE(key); return NT_STATUS_LOGON_FAILURE; } - + krb5_auth_con_setuseruserkey(context, auth_context, key); packet.length = ticket->length; |