diff options
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 10 | ||||
| -rw-r--r-- | source3/wscript | 5 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 1 |
4 files changed, 1 insertions, 21 deletions
diff --git a/source3/configure.in b/source3/configure.in index 90d0c5436a..192eaf9b2a 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -3869,7 +3869,6 @@ if test x"$with_ads_support" != x"no"; then AC_CHECK_FUNC_EXT(krb5_kt_free_entry, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_krbhst_init, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_krbhst_get_addrinfo, $KRB5_LIBS) - AC_CHECK_FUNC_EXT(krb5_c_enctype_compare, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_crypto_init, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_crypto_destroy, $KRB5_LIBS) AC_CHECK_FUNC_EXT(krb5_decode_ap_req, $KRB5_LIBS) @@ -4402,11 +4401,6 @@ if test x"$with_ads_support" != x"no"; then use_ads=no fi - if test x"$ac_cv_func_ext_krb5_c_enctype_compare" != x"yes"; then - AC_MSG_WARN(krb5_c_enctype_compare not found in -lkrb5) - use_ads=no - fi - if test x"$ac_cv_func_ext_krb5_get_host_realm" != x"yes" then AC_MSG_WARN(krb5_get_host_realm not found in -lkrb5) diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 02a02c56d0..9faf98bd02 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -358,16 +358,6 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_ #endif } - bool kerberos_compatible_enctypes(krb5_context context, - krb5_enctype enctype1, - krb5_enctype enctype2) -{ - krb5_boolean similar = 0; - - krb5_c_enctype_compare(context, enctype1, enctype2, &similar); - return similar ? True : False; -} - static bool ads_cleanup_expired_creds(krb5_context context, krb5_ccache ccache, krb5_creds *credsp) diff --git a/source3/wscript b/source3/wscript index d692b22cc4..f30bd4b80f 100644 --- a/source3/wscript +++ b/source3/wscript @@ -589,7 +589,7 @@ krb5_auth_con_setuseruserkey krb5_get_permitted_enctypes krb5_get_default_in_tkt_etypes krb5_free_data_contents krb5_principal_get_comp_string krb5_free_unparsed_name krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init -krb5_krbhst_get_addrinfo krb5_c_enctype_compare +krb5_krbhst_get_addrinfo krb5_crypto_init krb5_crypto_destroy krb5_decode_ap_req free_AP_REQ krb5_c_verify_checksum krb5_principal_compare_any_realm krb5_parse_name_norealm krb5_princ_size krb5_get_init_creds_opt_set_pac_request @@ -753,9 +753,6 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'): Logs.warn("krb5_mk_req_extended not found in -lkrb5") use_ads=False - if not conf.CONFIG_SET('HAVE_KRB5_C_ENCTYPE_COMPARE'): - Logs.warn("krb5_c_enctype_compare not found in -lkrb5") - use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_GET_HOST_REALM'): Logs.warn("krb5_get_host_realm not found in -lkrb5") use_ads=False diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 9f9aa9f44e..58c64be2a5 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -100,7 +100,6 @@ conf.define('HAVE_KRB5_AUTH_CON_SETKEY', 1) conf.define('HAVE_KRB5_CRYPTO', 1) conf.define('HAVE_KRB5_CRYPTO_DESTROY', 1) conf.define('HAVE_KRB5_CRYPTO_INIT', 1) -conf.define('HAVE_KRB5_C_ENCTYPE_COMPARE', 1) conf.define('HAVE_KRB5_C_VERIFY_CHECKSUM', 1) conf.define('HAVE_FREE_AP_REQ', 1) conf.define('HAVE_KRB5_DECODE_AP_REQ', 1) |