diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:45:16 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-03-17 22:45:16 +0000 |
| commit | ec458fa87e3ee858be39671f575e21a9350674b6 (patch) | |
| tree | fd61c4e08925ef898e2af49ba711e4ccf27a382f /source3/include | |
| parent | 395b8937ac3ad49faf65f4938212f7fa283c9da6 (diff) | |
| download | samba-ec458fa87e3ee858be39671f575e21a9350674b6.tar.gz samba-ec458fa87e3ee858be39671f575e21a9350674b6.tar.bz2 samba-ec458fa87e3ee858be39671f575e21a9350674b6.zip | |
Merge from HEAD - sync up SessionSetup code to HEAD, including Luke Howard's
session key and auth verifier patches.
Andrew Bartlett
(This used to be commit 3f9616a68a855acbae3f405c27ee2358fbe7ba2c)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/ads.h | 5 | ||||
| -rw-r--r-- | source3/include/asn_1.h | 7 | ||||
| -rw-r--r-- | source3/include/includes.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/source3/include/ads.h b/source3/include/ads.h index 304a997b2c..f90983e405 100644 --- a/source3/include/ads.h +++ b/source3/include/ads.h @@ -208,3 +208,8 @@ typedef void **ADS_MODLIST; /* Kerberos environment variable names */ #define KRB5_ENV_CCNAME "KRB5CCNAME" + +/* Heimdal uses a slightly different name */ +#if defined(HAVE_ENCTYPE_ARCFOUR_HMAC_MD5) +#define ENCTYPE_ARCFOUR_HMAC ENCTYPE_ARCFOUR_HMAC_MD5 +#endif diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h index ab7fa5d398..7d4da0db0c 100644 --- a/source3/include/asn_1.h +++ b/source3/include/asn_1.h @@ -59,4 +59,11 @@ typedef struct { #define SPNEGO_NEG_RESULT_INCOMPLETE 1 #define SPNEGO_NEG_RESULT_REJECT 2 +/* not really ASN.1, but RFC 1964 */ +#define TOK_ID_KRB_AP_REQ "\x01\x00" +#define TOK_ID_KRB_AP_REP "\x02\x00" +#define TOK_ID_KRB_ERROR "\x03\x00" +#define TOK_ID_GSS_GETMIC "\x01\x01" +#define TOK_ID_GSS_WRAP "\x02\x01" + #endif /* _ASN_1_H */ diff --git a/source3/include/includes.h b/source3/include/includes.h index e25ac4fef2..774df34de0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1235,6 +1235,7 @@ 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); +BOOL krb5_get_smb_session_key(krb5_context context, krb5_auth_context auth_context, uint8 session_key[16]); #endif /* HAVE_KRB5 */ #endif /* _INCLUDES_H */ |