Changeset 745 for trunk/server/source3/include/krb5_protos.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)
• source3/include/krb5_protos.h (modified) (7 diffs)

trunk/server/source3/include/krb5_protos.h

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* work around broken krb5.h on sles9 */
 #ifdef SIZEOF_LONG
@@ -37 +65 @@
 #endif
 
+
+
 /* Samba wrapper function for krb5 functionality. */
 bool setup_kaddr( krb5_address *pkaddr, struct sockaddr_storage *paddr);
@@ -47 +77 @@
 #endif
 krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
-bool get_krb5_smb_session_key(krb5_context context, krb5_auth_context auth_context, DATA_BLOB *session_key, bool remote);
+bool get_krb5_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);
 krb5_principal kerberos_fetch_salt_princ_for_host_princ(krb5_context context, krb5_principal host_princ, int enctype);
@@ -69 +102 @@
                                          size_t length);
 time_t get_authtime_from_tkt(krb5_ticket *tkt);
-void smb_krb5_free_ap_req(krb5_context context,
-                          krb5_ap_req *ap_req);
 krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context,
                                                  const krb5_data *inbuf,
@@ -89 +120 @@
                                           krb5_const_principal princ1,
                                           krb5_const_principal princ2);
-int cli_krb5_get_ticket(const char *principal, time_t time_offset,
-                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-                        uint32 extra_ap_opts, const char *ccname,
-                        time_t *tgs_expire,
-                        const char *impersonate_princ_s);
 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 kpasswd_err_to_krb5_err(krb5_error_code res_code);
@@ -124 +150 @@
                                      krb5_keytab keytab,
                                      const char **keytab_name);
-int smb_krb5_kt_add_entry_ext(krb5_context context,
-                              krb5_keytab keytab,
-                              krb5_kvno kvno,
-                              const char *princ_s,
-                              krb5_enctype *enctypes,
-                              krb5_data password,
-                              bool no_salt,
-                              bool keep_old_entries);
 krb5_error_code smb_krb5_get_credentials(krb5_context context,
                                          krb5_ccache ccache,
@@ -145 +163 @@
 char *smb_krb5_principal_get_realm(krb5_context context,
                                    krb5_principal principal);
+
+
 #endif /* HAVE_KRB5 */
 
+
+
+
+
+
+
+
+
+
+
+
+
+