krb5_samba: Add krb5_free_string macro for Heimdal build
[metze/samba/wip.git] / lib / krb5_wrap / krb5_samba.h
index 92ad48d2b17c709be3d53854daf1678e7252ef14..6f8e88336b29104795035891cbe5b693a925d003 100644 (file)
@@ -105,7 +105,7 @@ typedef struct {
 
 #ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY               /* MIT */
 #define KRB5_KT_KEY(k)         (&(k)->key)
-#elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK          /* Heimdal */
+#elif defined(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK)  /* Heimdal */
 #define KRB5_KT_KEY(k)         (&(k)->keyblock)
 #else
 #error krb5_keytab_entry has no key or keyblock member
@@ -143,6 +143,8 @@ krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
                                      krb5_const_principal principal,
                                      char **unix_name);
 
+krb5_error_code smb_krb5_init_context_common(krb5_context *_krb5_context);
+
 krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc);
 
 #if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
@@ -161,6 +163,14 @@ void krb5_free_unparsed_name(krb5_context ctx, char *val);
 #define initialize_krb5_error_table()
 #endif
 
+#ifndef HAVE_KRB5_FREE_STRING
+#ifdef HAVE_KRB5_XFREE
+#define krb5_free_string(context, ptr) krb5_xfree(ptr)
+#else
+#error krb5_xfree not available
+#endif
+#endif /* HAVE_KRB5_FREE_STRING */
+
 /* Samba wrapper functions for krb5 functionality. */
 bool smb_krb5_sockaddr_to_kaddr(struct sockaddr_storage *paddr,
                                krb5_address *pkaddr);
@@ -169,52 +179,39 @@ krb5_error_code smb_krb5_mk_error(krb5_context context,
                                  krb5_error_code error_code,
                                  const char *e_text,
                                  krb5_data *e_data,
+                                 const krb5_principal client,
+                                 const krb5_principal server,
                                  krb5_data *enc_err);
 
 krb5_error_code smb_krb5_get_allowed_etypes(krb5_context context,
                                            krb5_enctype **enctypes);
 
-bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
-                             krb5_context context,
-                             krb5_auth_context auth_context,
-                             DATA_BLOB *session_key, bool remote);
+bool smb_krb5_get_smb_session_key(TALLOC_CTX *mem_ctx,
+                                 krb5_context context,
+                                 krb5_auth_context auth_context,
+                                 DATA_BLOB *session_key,
+                                 bool remote);
+
 krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
-void kerberos_set_creds_enctype(krb5_creds *pcreds, int enctype);
-bool kerberos_compatible_enctypes(krb5_context context, krb5_enctype enctype1, krb5_enctype enctype2);
 void smb_krb5_free_data_contents(krb5_context context, krb5_data *pdata);
-krb5_error_code smb_krb5_parse_name_norealm(krb5_context context,
-                                           const char *name,
-                                           krb5_principal *principal);
-bool smb_krb5_principal_compare_any_realm(krb5_context context,
-                                         krb5_const_principal princ1,
-                                         krb5_const_principal princ2);
 krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
 krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr,
                                                  const char *netbios_name);
 krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
-NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
-krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
-void smb_krb5_free_error(krb5_context context, krb5_error *krberror);
-krb5_error_code handle_krberror_packet(krb5_context context,
-                                         krb5_data *packet);
-
-void smb_krb5_get_init_creds_opt_free(krb5_context context,
-                                   krb5_get_init_creds_opt *opt);
-krb5_error_code smb_krb5_get_init_creds_opt_alloc(krb5_context context,
-                                   krb5_get_init_creds_opt **opt);
-krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
+krb5_enctype smb_krb5_kt_get_enctype_from_entry(krb5_keytab_entry *kt_entry);
+
 krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
                                            krb5_enctype enctype,
                                            char **etype_s);
-krb5_error_code smb_krb5_open_keytab_relative(krb5_context context,
-                                             const char *keytab_name_req,
-                                             bool write_access,
-                                             krb5_keytab *keytab);
-krb5_error_code smb_krb5_open_keytab(krb5_context context,
-                                     const char *keytab_name,
-                                     bool write_access,
-                                     krb5_keytab *keytab);
-krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
+krb5_error_code smb_krb5_kt_open_relative(krb5_context context,
+                                         const char *keytab_name_req,
+                                         bool write_access,
+                                         krb5_keytab *keytab);
+krb5_error_code smb_krb5_kt_open(krb5_context context,
+                                const char *keytab_name,
+                                bool write_access,
+                                krb5_keytab *keytab);
+krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
                                     krb5_context context,
                                     krb5_keytab keytab,
                                     const char **keytab_name);
@@ -247,32 +244,33 @@ krb5_error_code smb_krb5_keyblock_init_contents(krb5_context context,
                                                const void *data,
                                                size_t length,
                                                krb5_keyblock *key);
-krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc,
-                                          krb5_principal principal,
-                                          krb5_keyblock *keyblock,
-                                          const char *target_service,
-                                          krb5_get_init_creds_opt *krb_options,
-                                          time_t *expire_time,
-                                          time_t *kdc_time);
-krb5_error_code kerberos_kinit_password_cc(krb5_context ctx,
-                                          krb5_ccache cc,
-                                          krb5_principal principal,
-                                          const char *password,
+krb5_error_code smb_krb5_kinit_keyblock_ccache(krb5_context ctx,
+                                              krb5_ccache cc,
+                                              krb5_principal principal,
+                                              krb5_keyblock *keyblock,
+                                              const char *target_service,
+                                              krb5_get_init_creds_opt *krb_options,
+                                              time_t *expire_time,
+                                              time_t *kdc_time);
+krb5_error_code smb_krb5_kinit_password_ccache(krb5_context ctx,
+                                              krb5_ccache cc,
+                                              krb5_principal principal,
+                                              const char *password,
+                                              const char *target_service,
+                                              krb5_get_init_creds_opt *krb_options,
+                                              time_t *expire_time,
+                                              time_t *kdc_time);
+#ifdef SAMBA4_USES_HEIMDAL
+krb5_error_code smb_krb5_kinit_s4u2_ccache(krb5_context ctx,
+                                          krb5_ccache store_cc,
+                                          krb5_principal init_principal,
+                                          const char *init_password,
+                                          krb5_principal impersonate_principal,
+                                          const char *self_service,
                                           const char *target_service,
                                           krb5_get_init_creds_opt *krb_options,
                                           time_t *expire_time,
                                           time_t *kdc_time);
-#ifdef SAMBA4_USES_HEIMDAL
-krb5_error_code kerberos_kinit_s4u2_cc(krb5_context ctx,
-                                       krb5_ccache store_cc,
-                                       krb5_principal init_principal,
-                                       const char *init_password,
-                                       krb5_principal impersonate_principal,
-                                       const char *self_service,
-                                       const char *target_service,
-                                       krb5_get_init_creds_opt *krb_options,
-                                       time_t *expire_time,
-                                       time_t *kdc_time);
 #endif
 
 #if defined(HAVE_KRB5_MAKE_PRINCIPAL)
@@ -310,7 +308,8 @@ krb5_error_code smb_krb5_make_pac_checksum(TALLOC_CTX *mem_ctx,
                                           uint32_t *sig_type,
                                           DATA_BLOB *sig_blob);
 
-char *smb_krb5_principal_get_realm(krb5_context context,
+char *smb_krb5_principal_get_realm(TALLOC_CTX *mem_ctx,
+                                  krb5_context context,
                                   krb5_const_principal principal);
 
 void smb_krb5_principal_set_type(krb5_context context,
@@ -321,20 +320,14 @@ krb5_error_code smb_krb5_principal_set_realm(krb5_context context,
                                             krb5_principal principal,
                                             const char *realm);
 
-char *kerberos_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
-                                                  const char *service,
-                                                  const char *remote_name,
-                                                  const char *default_realm);
+char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
+                                      const char *hostname,
+                                      const char *client_realm);
 
 char *smb_get_krb5_error_message(krb5_context context,
                                 krb5_error_code code,
                                 TALLOC_CTX *mem_ctx);
 
-bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
-                          DATA_BLOB *edata,
-                          DATA_BLOB *edata_out);
-
-
 krb5_error_code kt_copy(krb5_context context,
                        const char *from,
                        const char *to);
@@ -365,6 +358,16 @@ krb5_error_code ms_suptypes_to_ietf_enctypes(TALLOC_CTX *mem_ctx,
 int smb_krb5_get_pw_salt(krb5_context context,
                         krb5_const_principal host_princ,
                         krb5_data *psalt);
+int smb_krb5_salt_principal(const char *realm,
+                           const char *sAMAccountName,
+                           const char *userPrincipalName,
+                           uint32_t uac_flags,
+                           TALLOC_CTX *mem_ctx,
+                           char **_salt_principal);
+int smb_krb5_salt_principal2data(krb5_context context,
+                                const char *salt_principal,
+                                TALLOC_CTX *mem_ctx,
+                                char **_salt_data);
 
 int smb_krb5_create_key_from_string(krb5_context context,
                                    krb5_const_principal host_princ,