diff options
| -rw-r--r-- | source3/configure.in | 24 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 11 | ||||
| -rw-r--r-- | source3/wscript | 4 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 1 |
4 files changed, 0 insertions, 40 deletions
diff --git a/source3/configure.in b/source3/configure.in index 192eaf9b2a..ea212f603e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4067,30 +4067,6 @@ if test x"$with_ads_support" != x"no"; then [Whether the krb5_ticket struct has a enc_part2 property]) fi - AC_CACHE_CHECK([for keyblock in krb5_creds], - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS,[ - AC_TRY_COMPILE([#include <krb5.h>], - [krb5_creds creds; krb5_keyblock kb; creds.keyblock = kb;], - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=yes, - samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS=no)]) - - if test x"$samba_cv_HAVE_KRB5_KEYBLOCK_IN_CREDS" = x"yes"; then - AC_DEFINE(HAVE_KRB5_KEYBLOCK_IN_CREDS,1, - [Whether the krb5_creds struct has a keyblock property]) - fi - - AC_CACHE_CHECK([for session in krb5_creds], - samba_cv_HAVE_KRB5_SESSION_IN_CREDS,[ - AC_TRY_COMPILE([#include <krb5.h>], - [krb5_creds creds; krb5_keyblock kb; creds.session = kb;], - samba_cv_HAVE_KRB5_SESSION_IN_CREDS=yes, - samba_cv_HAVE_KRB5_SESSION_IN_CREDS=no)]) - - if test x"$samba_cv_HAVE_KRB5_SESSION_IN_CREDS" = x"yes"; then - AC_DEFINE(HAVE_KRB5_SESSION_IN_CREDS,1, - [Whether the krb5_creds struct has a session property]) - fi - AC_CACHE_CHECK([for keyvalue in krb5_keyblock], samba_cv_HAVE_KRB5_KEYBLOCK_KEYVALUE,[ AC_TRY_COMPILE([#include <krb5.h>], diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 9faf98bd02..304972fce4 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -347,17 +347,6 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_ #endif } - void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype) -{ -#if defined(HAVE_KRB5_KEYBLOCK_IN_CREDS) - KRB5_KEY_TYPE((&pcreds->keyblock)) = enctype; -#elif defined(HAVE_KRB5_SESSION_IN_CREDS) - KRB5_KEY_TYPE((&pcreds->session)) = enctype; -#else -#error UNKNOWN_KEYBLOCK_MEMBER_IN_KRB5_CREDS_STRUCT -#endif -} - static bool ads_cleanup_expired_creds(krb5_context context, krb5_ccache ccache, krb5_creds *credsp) diff --git a/source3/wscript b/source3/wscript index f30bd4b80f..b47d71a49c 100644 --- a/source3/wscript +++ b/source3/wscript @@ -620,10 +620,6 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''', define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS') conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part2', headers='krb5.h', define='HAVE_KRB5_TKT_ENC_PART2') - conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'keyblock', headers='krb5.h', - define='HAVE_KRB5_KEYBLOCK_IN_CREDS') - conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'session', headers='krb5.h', - define='HAVE_KRB5_SESSION_IN_CREDS') conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h', define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ') diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 58c64be2a5..a9ba14f8ca 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -132,7 +132,6 @@ conf.define('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM', 1) conf.define('HAVE_KRB5_PRINCIPAL_GET_COMP_STRING', 1) conf.define('HAVE_KRB5_PRINCIPAL_GET_REALM', 1) conf.define('HAVE_KRB5_REALM_TYPE', 1) -conf.define('HAVE_KRB5_SESSION_IN_CREDS', 1) conf.define('HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES', 1) conf.define('HAVE_KRB5_SET_REAL_TIME', 1) conf.define('HAVE_KRB5_STRING_TO_KEY', 1) |