Changeset 745 for trunk/server/source4/auth/kerberos/kerberos.h

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/auth/kerberos/kerberos.h (modified) (8 diffs)

trunk/server/source4/auth/kerberos/kerberos.h

@@ -24 +24 @@
 #include "librpc/gen_ndr/krb5pac.h"
 
-struct auth_serversupplied_info;
+struct auth_user_info_dc;
 struct cli_credentials;
 
@@ -53 +53 @@
 #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)
 
 #ifndef HAVE_KRB5_SET_REAL_TIME
@@ -89 +92 @@
                                 krb5_data *outbuf);
 bool get_auth_data_from_tkt(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, krb5_ticket *tkt);
-int kerberos_kinit_password_cc(krb5_context ctx, krb5_ccache cc, 
-                               krb5_principal principal, const char *password, 
-                               time_t *expire_time, time_t *kdc_time);
-int kerberos_kinit_keyblock_cc(krb5_context ctx, krb5_ccache cc, 
-                               krb5_principal principal, krb5_keyblock *keyblock,
-                               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_principal impersonate_principal, const char *target_service,
+                                           krb5_get_init_creds_opt *krb_options,
+                                           time_t *expire_time, time_t *kdc_time);
+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_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context,
                                                         krb5_principal host_princ,
@@ -103 +110 @@
 krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry);
 char *smb_get_krb5_error_message(krb5_context context, krb5_error_code code, TALLOC_CTX *mem_ctx);
- krb5_error_code kinit_to_ccache(TALLOC_CTX *parent_ctx,
-                          struct cli_credentials *credentials,
-                          struct smb_krb5_context *smb_krb5_context,
-                                 krb5_ccache ccache);
-krb5_error_code principal_from_credentials(TALLOC_CTX *parent_ctx, 
-                                           struct cli_credentials *credentials, 
-                                           struct smb_krb5_context *smb_krb5_context,
-                                           krb5_principal *princ);
 NTSTATUS kerberos_decode_pac(TALLOC_CTX *mem_ctx,
-                             struct smb_iconv_convenience *iconv_convenience,
                              struct PAC_DATA **pac_data_out,
                              DATA_BLOB blob,
@@ -122 +120 @@
                              krb5_error_code *k5ret);
  NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx,
-                                  struct smb_iconv_convenience *iconv_convenience,
                                   struct PAC_LOGON_INFO **logon_info,
                                   DATA_BLOB blob,
@@ -132 +129 @@
                                   krb5_error_code *k5ret);
  krb5_error_code kerberos_encode_pac(TALLOC_CTX *mem_ctx,
-                                     struct smb_iconv_convenience *iconv_convenience,
                                     struct PAC_DATA *pac_data,
                                     krb5_context context,
@@ -139 +135 @@
                                     DATA_BLOB *pac);
  krb5_error_code kerberos_create_pac(TALLOC_CTX *mem_ctx,
-                                     struct smb_iconv_convenience *iconv_convenience,
-                                     struct auth_serversupplied_info *server_info,
+                                     struct auth_user_info_dc *user_info_dc,
                                      krb5_context context,
                                      const krb5_keyblock *krbtgt_keyblock,
@@ -148 +143 @@
                                      DATA_BLOB *pac);
 struct loadparm_context;
+struct ldb_message;
+struct ldb_context;
+uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum);
+/* Translate between the Microsoft msDS-SupportedEncryptionTypes values and the IETF encryption type values */
+krb5_enctype kerberos_enctype_bitmap_to_enctype(uint32_t enctype_bitmap);
+krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx,
+                                       struct smb_krb5_context *smb_krb5_context,
+                                       struct ldb_context *ldb, 
+                                       struct ldb_message *msg,
+                                       bool delete_all_kvno,
+                                       const char **error_string);
 
 #include "auth/kerberos/proto.h"