auth/kerberos: Use talloc_stackframe to avoid memory and FD leak of event context

[kai/samba-autobuild/.git] / source4 / auth / kerberos / kerberos.h

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 51b80556bf81cb131000ce6d98f9972b695e06ca..2ff9e3868af94ee82b0e910d13c63267c1caffab 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -40,6 +40,7 @@ struct ccache_container {
 struct keytab_container {
        struct smb_krb5_context *smb_krb5_context;
        krb5_keytab keytab;
+       bool password_based;
 };
 
 /* not really ASN.1, but RFC 1964 */
@@ -49,16 +50,6 @@ struct keytab_container {
 #define TOK_ID_GSS_GETMIC      ((const uint8_t *)"\x01\x01")
 #define TOK_ID_GSS_WRAP                ((const uint8_t *)"\x02\x01")
 
-#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE
-#define KRB5_KEY_TYPE(k)       ((k)->keytype)
-#define KRB5_KEY_LENGTH(k)     ((k)->keyvalue.length)
-#define KRB5_KEY_DATA(k)       ((k)->keyvalue.data)
-#else
-#define        KRB5_KEY_TYPE(k)        ((k)->enctype)
-#define KRB5_KEY_LENGTH(k)     ((k)->length)
-#define KRB5_KEY_DATA(k)       ((k)->contents)
-#endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */
-
 #define ENC_ALL_TYPES (ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5 |    \
                       ENC_HMAC_SHA1_96_AES128 | ENC_HMAC_SHA1_96_AES256)
 
@@ -74,14 +65,6 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con
 const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i );
 #endif
 
-#ifndef krb5_princ_size
-#if defined(HAVE_KRB5_PRINCIPAL_GET_NUM_COMP)
-#define krb5_princ_size krb5_principal_get_num_comp
-#else
-#error krb5_princ_size unavailable
-#endif
-#endif
-
 /* Samba wrapper function for krb5 functionality. */
  krb5_error_code kerberos_encode_pac(TALLOC_CTX *mem_ctx,
                                    struct PAC_DATA *pac_data,