diff options
| author | Jeremy Allison <jra@samba.org> | 2003-01-21 20:43:26 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-01-21 20:43:26 +0000 |
| commit | e545fe3c0aa1901026d5d11fa48d084e4cecde40 (patch) | |
| tree | 9569f37afb5001f88391514c572b47e1ff89ea2e /source3/include | |
| parent | 85ecf66547e8e86bfd9726d7a08a67cb37672b30 (diff) | |
| download | samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.tar.gz samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.tar.bz2 samba-e545fe3c0aa1901026d5d11fa48d084e4cecde40.zip | |
Get closer to Heimdal compile... Damn. HEAD has different code in
kerberos_verify...
Jeremy.
(This used to be commit e8c4098da619a1429cc4c8251761333a7c0f3458)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 21 | ||||
| -rw-r--r-- | source3/include/includes.h | 12 |
2 files changed, 32 insertions, 1 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 36e200eaa0..6b5256f879 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -555,9 +555,21 @@ /* Whether KRB5 is available */ #undef HAVE_KRB5 +/* Whether krb5_auth_con_setkey is available */ +#undef HAVE_KRB5_AUTH_CON_SETKEY + +/* Whether krb5_auth_con_setuseruserkey is available */ +#undef HAVE_KRB5_AUTH_CON_SETUSERUSERKEY + +/* Whether krb5_get_pw_salt is available */ +#undef HAVE_KRB5_GET_PW_SALT + /* Define to 1 if you have the <krb5.h> header file. */ #undef HAVE_KRB5_H +/* Whether krb5_principal2salt is available */ +#undef HAVE_KRB5_PRINCIPAL2SALT + /* Whether krb5_set_default_in_tkt_etypes, is available */ #undef HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES @@ -567,6 +579,15 @@ /* Whether krb5_set_real_time is available */ #undef HAVE_KRB5_SET_REAL_TIME +/* Whether krb5_string_to_key is available */ +#undef HAVE_KRB5_STRING_TO_KEY + +/* Whether krb5_string_to_key_salt is available */ +#undef HAVE_KRB5_STRING_TO_KEY_SALT + +/* Whether krb5_use_enctype is available */ +#undef HAVE_KRB5_USE_ENCTYPE + /* Define to 1 if you have the <lastlog.h> header file. */ #undef HAVE_LASTLOG_H diff --git a/source3/include/includes.h b/source3/include/includes.h index 23d6d1c457..c329085c97 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1214,8 +1214,18 @@ krb5_error_code krb5_set_real_time(krb5_context context, int32_t seconds, int32_ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype *enc); #endif -/* Samba wrapper function for krb5 functionality. */ +#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) +krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, + krb5_auth_context auth_context, + krb5_keyblock *keyblock); +#endif + +/* Samba wrapper functions 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); #endif /* HAVE_KRB5 */ |