diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-17 13:36:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-17 17:36:38 +1100 |
| commit | 674278d5b0d68e96d68f7beab2289a502efa6bc4 (patch) | |
| tree | 2e34f2f291f6dc00cc284554eb74c665adbe8f4b /source3/include/smb_krb5.h | |
| parent | a315350341d7090402fe8fe2991d18fa530d2398 (diff) | |
| download | samba-674278d5b0d68e96d68f7beab2289a502efa6bc4.tar.gz samba-674278d5b0d68e96d68f7beab2289a502efa6bc4.tar.bz2 samba-674278d5b0d68e96d68f7beab2289a502efa6bc4.zip | |
auth/kerberos: Move gse_get_session_key() to common code and use in gensec_gssapi
Thie ensures that both code bases use the same logic to determine the use
of NEW_SPNEGO.
Andrew Bartlett
Diffstat (limited to 'source3/include/smb_krb5.h')
| -rw-r--r-- | source3/include/smb_krb5.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source3/include/smb_krb5.h b/source3/include/smb_krb5.h index bc9996c541..152652512d 100644 --- a/source3/include/smb_krb5.h +++ b/source3/include/smb_krb5.h @@ -66,18 +66,6 @@ typedef struct { #endif /* defined(HAVE_MAGIC_IN_KRB5_ADDRESS) && defined(HAVE_ADDRTYPE_IN_KRB5_ADDRESS) */ } smb_krb5_addresses; -#ifdef HAVE_KRB5_KEYBLOCK_KEYVALUE /* Heimdal */ -#define KRB5_KEY_TYPE(k) ((k)->keytype) -#define KRB5_KEY_LENGTH(k) ((k)->keyvalue.length) -#define KRB5_KEY_DATA(k) ((k)->keyvalue.data) -#define KRB5_KEY_DATA_CAST void -#else /* MIT */ -#define KRB5_KEY_TYPE(k) ((k)->enctype) -#define KRB5_KEY_LENGTH(k) ((k)->length) -#define KRB5_KEY_DATA(k) ((k)->contents) -#define KRB5_KEY_DATA_CAST krb5_octet -#endif /* HAVE_KRB5_KEYBLOCK_KEYVALUE */ - #ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY /* MIT */ #define KRB5_KT_KEY(k) (&(k)->key) #elif HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */ |