diff options
| author | Jeremy Allison <jra@samba.org> | 2007-03-21 19:15:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:48 -0500 |
| commit | 42238c78bb8820a21cfb08fc29a5109ee1a62bab (patch) | |
| tree | 7b794df2ecfb47779e70b30e24f288e2eca53bdf /source3/include | |
| parent | 56c777882f0e9fc64e69290db8f6db5fe90225fd (diff) | |
| download | samba-42238c78bb8820a21cfb08fc29a5109ee1a62bab.tar.gz samba-42238c78bb8820a21cfb08fc29a5109ee1a62bab.tar.bz2 samba-42238c78bb8820a21cfb08fc29a5109ee1a62bab.zip | |
r21917: Start to do the gss versions of sign+seal.
Jeremy.
(This used to be commit a226645353a40047b72de1b96c3a7676a2bf1034)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/client.h | 4 | ||||
| -rw-r--r-- | source3/include/includes.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/include/client.h b/source3/include/client.h index 0f268834c6..a81c19bc55 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -79,14 +79,14 @@ struct rpc_pipe_client { }; /* Transport encryption state. */ -enum smb_trans_enc_type { SMB_TRANS_ENC_NTLM, SMB_TRANS_ENC_KRB5 }; +enum smb_trans_enc_type { SMB_TRANS_ENC_NTLM, SMB_TRANS_ENC_GSS }; struct smb_trans_enc_state { enum smb_trans_enc_type smb_enc_type; BOOL enc_on; union { NTLMSSP_STATE *ntlmssp_state; -#if defined(HAVE_GSSAPI_SUPPORT) && defined(HAVE_KRB5) +#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5) gss_ctx_id_t context_handle; #endif }; diff --git a/source3/include/includes.h b/source3/include/includes.h index b591d7d807..c51da335a2 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1187,10 +1187,10 @@ krb5_error_code smb_krb5_mk_error(krb5_context context, krb5_data *reply); /* Call for SMB transport encryption. */ -#if defined(HAVE_GSSAPI_SUPPORT) +#if defined(HAVE_GSSAPI) NTSTATUS common_gss_decrypt_buffer(gss_ctx_id_t context_handle, char *buf); #endif -#if defined(HAVE_GSSAPI_SUPPORT) +#if defined(HAVE_GSSAPI) NTSTATUS common_gss_encrypt_buffer(gss_ctx_id_t context_handle, char *buf, char **buf_out); #endif |