Split normal kinit from s4u2 flavored kinit

This makes it simpler to slowly integrate MIT support and also amkes it
somewhat clearer what operation is really requested.
The 24u2 part is really only used by the cifs proxy code so we can temporarily
disable it in the MIT build w/o major consequences.

1 files changed, 15 insertions, 5 deletions

diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h
index d235563a7b..864cda67bb 100644
--- a/lib/krb5_wrap/krb5_samba.h
+++ b/lib/krb5_wrap/krb5_samba.h
@@ -206,15 +206,25 @@ krb5_error_code kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc,
 					   time_t *expire_time,
 					   time_t *kdc_time);
 krb5_error_code kerberos_kinit_password_cc(krb5_context ctx,
-					   krb5_ccache store_cc,
-					   krb5_principal init_principal,
-					   const char *init_password,
-					   krb5_principal impersonate_principal,
-					   const char *self_service,
+					   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 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
 char *smb_krb5_principal_get_realm(krb5_context context,
 				   krb5_principal principal);