diff options
| author | Jim McDonough <jmcd@samba.org> | 2003-02-19 01:16:40 +0000 |
|---|---|---|
| committer | Jim McDonough <jmcd@samba.org> | 2003-02-19 01:16:40 +0000 |
| commit | adfefcdcb6e9d8ea0458a11b6f684a5cf231c3ba (patch) | |
| tree | d9afd403aac46465eac080932df856dfa675099d /source3/include | |
| parent | e354fd27cb05f9d6259ca480831e325d17cfefea (diff) | |
| download | samba-adfefcdcb6e9d8ea0458a11b6f684a5cf231c3ba.tar.gz samba-adfefcdcb6e9d8ea0458a11b6f684a5cf231c3ba.tar.bz2 samba-adfefcdcb6e9d8ea0458a11b6f684a5cf231c3ba.zip | |
Try to get heimdal working with HEAD.
- Provide generic functions for
- get valid encryption types
- free encryption types
- Add encryption type parm to generic function create_kerberos_key_from_string()
- Try to merge the two versions (between HEAD and SAMBA_3_0) of kerberos_verify.c
I think this should work for both MIT and heimdal, in HEAD. If all goes smooth,
I'll move it over to 3.0 soon...
(This used to be commit 45e409fc8da9f26cf888e13d004392660d7c55d4)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 988913d16c..c5738f0a61 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 */ |