diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-11 11:52:13 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-01-18 19:29:40 +0100 |
| commit | 6411faf379e002605f5397c693d11760ba615abc (patch) | |
| tree | 395a7accae1c3138aad05ae46c14797831731055 | |
| parent | e249bdd32ef9d6342901c596bba825c731d96180 (diff) | |
| download | samba-6411faf379e002605f5397c693d11760ba615abc.tar.gz samba-6411faf379e002605f5397c693d11760ba615abc.tar.bz2 samba-6411faf379e002605f5397c693d11760ba615abc.zip | |
auth/gensec: align common elements between gse_context and gensec_gssapi_state
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Wed Jan 18 19:29:40 CET 2012 on sn-devel-104
| -rw-r--r-- | auth/gensec/gensec_gssapi.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/auth/gensec/gensec_gssapi.h b/auth/gensec/gensec_gssapi.h index 4a64762fdc..97c54918bf 100644 --- a/auth/gensec/gensec_gssapi.h +++ b/auth/gensec/gensec_gssapi.h @@ -37,19 +37,21 @@ enum gensec_gssapi_sasl_state struct gensec_gssapi_state { gss_ctx_id_t gssapi_context; - struct gss_channel_bindings_struct *input_chan_bindings; gss_name_t server_name; gss_name_t client_name; OM_uint32 gss_want_flags, gss_got_flags; + + gss_cred_id_t delegated_cred_handle; + + /* gensec_gssapi only */ gss_OID gss_oid; + struct gss_channel_bindings_struct *input_chan_bindings; struct smb_krb5_context *smb_krb5_context; struct gssapi_creds_container *client_cred; struct gssapi_creds_container *server_cred; gss_krb5_lucid_context_v1_t *lucid; - gss_cred_id_t delegated_cred_handle; - bool sasl; /* We have two different mechs in this file: One * for SASL wrapped GSSAPI and another for normal * GSSAPI */ |