diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-08-20 06:08:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:33:36 -0500 |
| commit | 40f56f63bec5a609229033dc4c0854bb4fb16f06 (patch) | |
| tree | 0bce454b79bfa8f387e9f2ca94c1bccbec51f6fc /source4/auth/kerberos/clikrb5.c | |
| parent | 479be53c0a894df441db9a02d0b75b222b374ae9 (diff) | |
| download | samba-40f56f63bec5a609229033dc4c0854bb4fb16f06.tar.gz samba-40f56f63bec5a609229033dc4c0854bb4fb16f06.tar.bz2 samba-40f56f63bec5a609229033dc4c0854bb4fb16f06.zip | |
r9415: Remove old kerberos code (including salt guessing code) that has only
caused me pain (and covourty warnings).
Simply gensec_gssapi to assume the properties of lorikeet-heimdal,
rather than having #ifdef around critical features. This simplifies
the code rather a lot.
Andrew Bartlett
(This used to be commit 11156f556db678c3d325fe5ced5e41a76ed6a3f1)
Diffstat (limited to 'source4/auth/kerberos/clikrb5.c')
| -rw-r--r-- | source4/auth/kerberos/clikrb5.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c index 51638af2c9..7a43498773 100644 --- a/source4/auth/kerberos/clikrb5.c +++ b/source4/auth/kerberos/clikrb5.c @@ -76,7 +76,7 @@ #endif #if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY) && defined(HAVE_KRB5_ENCRYPT_BLOCK) - int create_kerberos_key_from_string_direct(krb5_context context, + int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, @@ -97,7 +97,7 @@ return ret; } #elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT) - int create_kerberos_key_from_string_direct(krb5_context context, + int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, @@ -118,27 +118,6 @@ #error UNKNOWN_CREATE_KEY_FUNCTIONS #endif - int create_kerberos_key_from_string(krb5_context context, - krb5_principal host_princ, - krb5_data *password, - krb5_keyblock *key, - krb5_enctype enctype) -{ - krb5_principal salt_princ = NULL; - int ret; - /* - * Check if we've determined that the KDC is salting keys for this - * principal/enctype in a non-obvious way. If it is, try to match - * its behavior. - */ - salt_princ = kerberos_fetch_salt_princ_for_host_princ(context, host_princ, enctype); - ret = create_kerberos_key_from_string_direct(context, salt_princ ? salt_princ : host_princ, password, key, enctype); - if (salt_princ) { - krb5_free_principal(context, salt_princ); - } - return ret; -} - #if defined(HAVE_KRB5_GET_PERMITTED_ENCTYPES) krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes) |