s3-libsmb: Remove unused kerberos_compatible_enctypes

[samba.git] / source3 / libsmb / clikrb5.c

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index c0d822e5da2e0f314f328cf1ae9e514455ee2d13..9faf98bd02418b5d0110cca869123519a1ace166 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -50,26 +50,6 @@ krb5_error_code krb5_auth_con_set_req_cksumtype(
        krb5_cksumtype     cksumtype);
 #endif
 
-#ifndef HAVE_KRB5_SET_REAL_TIME
-/*
- * This function is not in the Heimdal mainline.
- */
- krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_t microseconds)
-{
-       krb5_error_code ret;
-       int32_t sec, usec;
-
-       ret = krb5_us_timeofday(context, &sec, &usec);
-       if (ret)
-               return ret;
-
-       context->kdc_sec_offset = seconds - sec;
-       context->kdc_usec_offset = microseconds - usec;
-
-       return 0;
-}
-#endif
-
 #if !defined(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES)
 
 #if defined(HAVE_KRB5_SET_DEFAULT_TGS_ENCTYPES)
@@ -367,95 +347,6 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
 #endif
 }
 
-#if !defined(HAVE_KRB5_LOCATE_KDC)
-
-/* krb5_locate_kdc is an internal MIT symbol. MIT are not yet willing to commit
- * to a public interface for this functionality, so we have to be able to live
- * without it if the MIT libraries are hiding their internal symbols.
- */
-
-#if defined(KRB5_KRBHST_INIT)
-/* Heimdal */
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-       krb5_krbhst_handle hnd;
-       krb5_krbhst_info *hinfo;
-       krb5_error_code rc;
-       int num_kdcs, i;
-       struct sockaddr *sa;
-       struct addrinfo *ai;
-
-       *addr_pp = NULL;
-       *naddrs = 0;
-
-       rc = krb5_krbhst_init(ctx, realm->data, KRB5_KRBHST_KDC, &hnd);
-       if (rc) {
-               DEBUG(0, ("smb_krb5_locate_kdc: krb5_krbhst_init failed (%s)\n", error_message(rc)));
-               return rc;
-       }
-
-       for ( num_kdcs = 0; (rc = krb5_krbhst_next(ctx, hnd, &hinfo) == 0); num_kdcs++)
-               ;
-
-       krb5_krbhst_reset(ctx, hnd);
-
-       if (!num_kdcs) {
-               DEBUG(0, ("smb_krb5_locate_kdc: zero kdcs found !\n"));
-               krb5_krbhst_free(ctx, hnd);
-               return -1;
-       }
-
-       sa = SMB_MALLOC_ARRAY( struct sockaddr, num_kdcs );
-       if (!sa) {
-               DEBUG(0, ("smb_krb5_locate_kdc: malloc failed\n"));
-               krb5_krbhst_free(ctx, hnd);
-               naddrs = 0;
-               return -1;
-       }
-
-       memset(sa, '\0', sizeof(struct sockaddr) * num_kdcs );
-
-       for (i = 0; i < num_kdcs && (rc = krb5_krbhst_next(ctx, hnd, &hinfo) == 0); i++) {
-
-#if defined(HAVE_KRB5_KRBHST_GET_ADDRINFO)
-               rc = krb5_krbhst_get_addrinfo(ctx, hinfo, &ai);
-               if (rc) {
-                       DEBUG(0,("krb5_krbhst_get_addrinfo failed: %s\n", error_message(rc)));
-                       continue;
-               }
-#endif
-               if (hinfo->ai && hinfo->ai->ai_family == AF_INET) 
-                       memcpy(&sa[i], hinfo->ai->ai_addr, sizeof(struct sockaddr));
-       }
-
-       krb5_krbhst_free(ctx, hnd);
-
-       *naddrs = num_kdcs;
-       *addr_pp = sa;
-       return 0;
-}
-
-#else /* ! defined(KRB5_KRBHST_INIT) */
-
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
-               struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-       DEBUG(0, ("unable to explicitly locate the KDC on this platform\n"));
-       return KRB5_KDC_UNREACH;
-}
-
-#endif /* KRB5_KRBHST_INIT */
-
-#else /* ! HAVE_KRB5_LOCATE_KDC */
-
- krb5_error_code smb_krb5_locate_kdc(krb5_context ctx, const krb5_data *realm,
-               struct sockaddr **addr_pp, int *naddrs, int get_masters)
-{
-       return krb5_locate_kdc(ctx, realm, addr_pp, naddrs, get_masters);
-}
-
-#endif /* HAVE_KRB5_LOCATE_KDC */
-
  void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype)
 {
 #if defined(HAVE_KRB5_KEYBLOCK_IN_CREDS)
@@ -467,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)
@@ -1405,43 +1286,6 @@ done:
 #else
 #error UNKNOWN_KRB5_ENCTYPE_TO_STRING_FUNCTION
 #endif
-}
-
- krb5_error_code smb_krb5_mk_error(krb5_context context,
-                               krb5_error_code error_code,
-                               const krb5_principal server,
-                               krb5_data *reply)
-{
-#ifdef HAVE_SHORT_KRB5_MK_ERROR_INTERFACE /* MIT */
-       /*
-        * The MIT interface is *terrible*.
-        * We have to construct this ourselves...
-        */
-       krb5_error e;
-
-       memset(&e, 0, sizeof(e));
-       krb5_us_timeofday(context, &e.stime, &e.susec);
-       e.server = server;
-#if defined(krb5_err_base)
-       e.error = error_code - krb5_err_base;
-#elif defined(ERROR_TABLE_BASE_krb5)
-       e.error = error_code - ERROR_TABLE_BASE_krb5;
-#else
-       e.error = error_code; /* Almost certainly wrong, but what can we do... ? */
-#endif
-
-       return krb5_mk_error(context, &e, reply);
-#else /* Heimdal. */
-       return krb5_mk_error(context,
-                               error_code,
-                               NULL,
-                               NULL, /* e_data */
-                               NULL,
-                               server,
-                               NULL,
-                               NULL,
-                               reply);
-#endif
 }
 
 /**********************************************************************