summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-01-11 11:52:13 +1100
committerStefan Metzmacher <metze@samba.org>2012-01-18 16:23:25 +0100
commite249bdd32ef9d6342901c596bba825c731d96180 (patch)
treedc94b57194d396e21454facaae0153b531ba24cd
parent67279780dd5742397918b532b4bc5e89072ab82d (diff)
downloadsamba-e249bdd32ef9d6342901c596bba825c731d96180.tar.gz
samba-e249bdd32ef9d6342901c596bba825c731d96180.tar.bz2
samba-e249bdd32ef9d6342901c596bba825c731d96180.zip
s3-gse: align common elements between gse_context and gensec_gssapi_state
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/librpc/crypto/gse.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
index 010d525229..7cf116522d 100644
--- a/source3/librpc/crypto/gse.c
+++ b/source3/librpc/crypto/gse.c
@@ -70,21 +70,22 @@ gss_OID_desc gse_authz_data_oid = {
static char *gse_errstr(TALLOC_CTX *mem_ctx, OM_uint32 maj, OM_uint32 min);
struct gse_context {
+ gss_ctx_id_t gssapi_context;
+ 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_gse only */
krb5_context k5ctx;
krb5_ccache ccache;
krb5_keytab keytab;
- gss_ctx_id_t gssapi_context;
-
gss_OID_desc gss_mech;
- OM_uint32 gss_want_flags;
gss_cred_id_t creds;
- gss_name_t server_name;
gss_OID ret_mech;
- OM_uint32 gss_got_flags;
- gss_cred_id_t delegated_cred_handle;
- gss_name_t client_name;
};
#ifndef HAVE_GSS_OID_EQUAL