From 93aa4511b9843fb0b96c5d568888778bc5a8367c Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 30 Mar 2012 15:48:54 -0400 Subject: gensec_gssapi: keep private header file close to the actual code Signed-off-by: Andreas Schneider --- auth/gensec/gensec_gssapi.h | 70 ------------------------------------- source4/auth/gensec/gensec_gssapi.c | 2 +- source4/auth/gensec/gensec_gssapi.h | 69 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 71 deletions(-) delete mode 100644 auth/gensec/gensec_gssapi.h create mode 100644 source4/auth/gensec/gensec_gssapi.h diff --git a/auth/gensec/gensec_gssapi.h b/auth/gensec/gensec_gssapi.h deleted file mode 100644 index 694ca6be89..0000000000 --- a/auth/gensec/gensec_gssapi.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Kerberos backend for GENSEC - - Copyright (C) Andrew Bartlett 2004-2005 - Copyright (C) Stefan Metzmacher 2004-2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -/* This structure described here, so the RPC-PAC test can get at the PAC provided */ - -enum gensec_gssapi_sasl_state -{ - STAGE_GSS_NEG, - STAGE_SASL_SSF_NEG, - STAGE_SASL_SSF_ACCEPT, - STAGE_DONE -}; - -#define NEG_SEAL 0x4 -#define NEG_SIGN 0x2 -#define NEG_NONE 0x1 - -struct gensec_gssapi_state { - 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_gssapi only */ - gss_krb5_lucid_context_v1_t *lucid; - 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; - - bool sasl; /* We have two different mechs in this file: One - * for SASL wrapped GSSAPI and another for normal - * GSSAPI */ - enum gensec_gssapi_sasl_state sasl_state; - uint8_t sasl_protection; /* What was negotiated at the SASL - * layer, independent of the GSSAPI - * layer... */ - - size_t max_wrap_buf_size; - int gss_exchange_count; - size_t sig_size; - - const char *target_principal; -}; - diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index b2729a9bae..29f1e469e5 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -40,7 +40,7 @@ #include #include #include -#include "auth/gensec/gensec_gssapi.h" +#include "gensec_gssapi.h" #include "lib/util/util_net.h" _PUBLIC_ NTSTATUS gensec_gssapi_init(void); diff --git a/source4/auth/gensec/gensec_gssapi.h b/source4/auth/gensec/gensec_gssapi.h new file mode 100644 index 0000000000..569d787f7f --- /dev/null +++ b/source4/auth/gensec/gensec_gssapi.h @@ -0,0 +1,69 @@ +/* + Unix SMB/CIFS implementation. + + Kerberos backend for GENSEC + + Copyright (C) Andrew Bartlett 2004-2005 + Copyright (C) Stefan Metzmacher 2004-2005 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/* This structure described here, so the RPC-PAC test can get at the PAC provided */ + +enum gensec_gssapi_sasl_state +{ + STAGE_GSS_NEG, + STAGE_SASL_SSF_NEG, + STAGE_SASL_SSF_ACCEPT, + STAGE_DONE +}; + +#define NEG_SEAL 0x4 +#define NEG_SIGN 0x2 +#define NEG_NONE 0x1 + +struct gensec_gssapi_state { + 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_gssapi only */ + gss_krb5_lucid_context_v1_t *lucid; + 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; + + bool sasl; /* We have two different mechs in this file: One + * for SASL wrapped GSSAPI and another for normal + * GSSAPI */ + enum gensec_gssapi_sasl_state sasl_state; + uint8_t sasl_protection; /* What was negotiated at the SASL + * layer, independent of the GSSAPI + * layer... */ + + size_t max_wrap_buf_size; + int gss_exchange_count; + size_t sig_size; + + const char *target_principal; +}; -- cgit