summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-02-19 15:48:12 +0000
committerJim McDonough <jmcd@samba.org>2003-02-19 15:48:12 +0000
commit83a11f7f0e4331602acefcb3324be6f35f1fef0e (patch)
tree3141eed2807387c2def2056267919bf4b436243c /source3/include
parent4560329abbdbdc9dea75f32422ba9b08bcfee726 (diff)
downloadsamba-83a11f7f0e4331602acefcb3324be6f35f1fef0e.tar.gz
samba-83a11f7f0e4331602acefcb3324be6f35f1fef0e.tar.bz2
samba-83a11f7f0e4331602acefcb3324be6f35f1fef0e.zip
Sync with HEAD for verifying kerberos tickets.
(This used to be commit 77e1178a888f0d380a5ef94911a8f07bf04a7ba3)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 5aaf009738..d33c7d766a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1224,11 +1224,12 @@ krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_con
/* Samba wrapper function for krb5 functionality. */
void setup_kaddr( krb5_address *pkaddr, struct sockaddr *paddr);
-int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key);
+int create_kerberos_key_from_string(krb5_context context, krb5_principal host_princ, krb5_data *password, krb5_keyblock *key, krb5_enctype enctype);
void get_auth_data_from_tkt(DATA_BLOB *auth_data, krb5_ticket *tkt);
krb5_const_principal get_principal_from_tkt(krb5_ticket *tkt);
krb5_error_code krb5_locate_kdc(krb5_context ctx, const krb5_data *realm, struct sockaddr **addr_pp, int *naddrs, int get_masters);
-
+krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes);
+void free_kerberos_etypes(krb5_context context, krb5_enctype *enctypes);
#endif /* HAVE_KRB5 */
#endif /* _INCLUDES_H */