s3-libsmb: Remove unused kerberos_compatible_enctypes

Also remove the unused configure tests for krb5_c_enctype_compare.

Found by callcatcher: http://www.skynet.ie/~caolan/Packages/callcatcher.html

Andrew Bartlett

diff --git a/source3/configure.in b/source3/configure.in
index 90d0c5436a5948a34d759c3a6307fdc280f77646..192eaf9b2a442a8e656169499c049af9f385ffe7 100644 (file)
--- 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 02a02c56d039938671dff1312d933f1c0a21e635..9faf98bd02418b5d0110cca869123519a1ace166 100644 (file)
--- 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 d692b22cc48f3918d95729ca5389366189dba26a..f30bd4b80f08fa0cbae4c00e89057bc669cab90a 100644 (file)
--- 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 9f9aa9f44e6a6052caecac40edf89621d22486dd..58c64be2a51c53bab5d59d19bf091860127c8602 100644 (file)
--- 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)