diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-12-29 09:18:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:47 -0500 |
| commit | 0b72c04906b1c25e80b217a8f34fd3a8e756b9ca (patch) | |
| tree | b300e22329997923eea8bc3498d60a7cf1551998 /source/libsmb/clikrb5.c | |
| parent | e43aa4e03d8d2d3ffa3a0383b0b0835dd1a51cda (diff) | |
| download | samba-0b72c04906b1c25e80b217a8f34fd3a8e756b9ca.tar.gz samba-0b72c04906b1c25e80b217a8f34fd3a8e756b9ca.tar.xz samba-0b72c04906b1c25e80b217a8f34fd3a8e756b9ca.zip | |
r20403: Cleaning out my Samba 3.0 tree:
As discussed with jerry at the CIFS conf: overriding the
administrator's wishes from the krb5.conf has only every given me
segfaults. We suggest leaving this up to the defaults from the
libraries anyway.
Andrew Bartlett
Diffstat (limited to 'source/libsmb/clikrb5.c')
| -rw-r--r-- | source/libsmb/clikrb5.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c index 4092b4b2b90..0df45f1b4d5 100644 --- a/source/libsmb/clikrb5.c +++ b/source/libsmb/clikrb5.c @@ -130,35 +130,6 @@ static krb5_error_code smb_krb5_parse_name_norealm_conv(krb5_context context, } #endif -#if !defined(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES) - -#if defined(HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES) - -/* With MIT kerberos, we should use krb5_set_default_tgs_enctypes in preference - * to krb5_set_default_tgs_ktypes. See - * http://lists.samba.org/archive/samba-technical/2006-July/048271.html - * - * If the MIT libraries are not exporting internal symbols, we will end up in - * this branch, which is correct. Otherwise we will continue to use the - * internal symbol - */ - krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc) -{ - return krb5_set_default_tgs_enctypes(ctx, enc); -} - -#elif defined(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES) - -/* Heimdal */ - krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc) -{ - return krb5_set_default_in_tkt_etypes(ctx, enc); -} - -#endif /* HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES */ - -#endif /* HAVE_KRB5_SET_DEFAULT_TGS_KTYPES */ - #if defined(HAVE_ADDR_TYPE_IN_KRB5_ADDRESS) /* HEIMDAL */ void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr) @@ -641,13 +612,6 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset, krb5_context context = NULL; krb5_ccache ccdef = NULL; krb5_auth_context auth_context = NULL; - krb5_enctype enc_types[] = { -#ifdef ENCTYPE_ARCFOUR_HMAC - ENCTYPE_ARCFOUR_HMAC, -#endif - ENCTYPE_DES_CBC_MD5, - ENCTYPE_DES_CBC_CRC, - ENCTYPE_NULL}; initialize_krb5_error_table(); retval = krb5_init_context(&context); @@ -668,12 +632,6 @@ int cli_krb5_get_ticket(const char *principal, time_t time_offset, goto failed; } - if ((retval = krb5_set_default_tgs_ktypes(context, enc_types))) { - DEBUG(1,("cli_krb5_get_ticket: krb5_set_default_tgs_ktypes failed (%s)\n", - error_message(retval))); - goto failed; - } - if ((retval = ads_krb5_mk_req(context, &auth_context, AP_OPTS_USE_SUBKEY | (krb5_flags)extra_ap_opts, |