summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-03-22 02:24:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:49 -0500
commitf93d75c932e7a48da8bcd589d7505bf5445b89df (patch)
treeaa9fab98c614274dc5de0f49f1cc084c023c2b1a
parent23149b3bb8257eeb1aeb15f165099bf3447ee05b (diff)
downloadsamba-f93d75c932e7a48da8bcd589d7505bf5445b89df.tar.gz
samba-f93d75c932e7a48da8bcd589d7505bf5445b89df.tar.bz2
samba-f93d75c932e7a48da8bcd589d7505bf5445b89df.zip
r21926: Fix missing enum specifier pointed out by Don McCall @ HP.
Thanks Don ! Jeremy. (This used to be commit 662344d1ec3593689de7602afa518ed98e10dc37)
-rw-r--r--source3/include/client.h2
-rw-r--r--source3/libsmb/clifsinfo.c14
-rw-r--r--source3/libsmb/smb_seal.c12
-rw-r--r--source3/smbd/seal.c6
4 files changed, 17 insertions, 17 deletions
diff --git a/source3/include/client.h b/source3/include/client.h
index a81c19bc55..817ab0d540 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -89,7 +89,7 @@ struct smb_trans_enc_state {
#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
gss_ctx_id_t context_handle;
#endif
- };
+ } s;
};
struct cli_state {
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 8e994dd67b..92537ed317 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -373,26 +373,26 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
}
ZERO_STRUCTP(es);
es->smb_enc_type = SMB_TRANS_ENC_NTLM;
- status = ntlmssp_client_start(&es->ntlmssp_state);
+ status = ntlmssp_client_start(&es->s.ntlmssp_state);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}
- ntlmssp_want_feature(es->ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
- es->ntlmssp_state->neg_flags |= (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL);
+ ntlmssp_want_feature(es->s.ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
+ es->s.ntlmssp_state->neg_flags |= (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL);
- if (!NT_STATUS_IS_OK(status = ntlmssp_set_username(es->ntlmssp_state, user))) {
+ if (!NT_STATUS_IS_OK(status = ntlmssp_set_username(es->s.ntlmssp_state, user))) {
goto fail;
}
- if (!NT_STATUS_IS_OK(status = ntlmssp_set_domain(es->ntlmssp_state, domain))) {
+ if (!NT_STATUS_IS_OK(status = ntlmssp_set_domain(es->s.ntlmssp_state, domain))) {
goto fail;
}
- if (!NT_STATUS_IS_OK(status = ntlmssp_set_password(es->ntlmssp_state, pass))) {
+ if (!NT_STATUS_IS_OK(status = ntlmssp_set_password(es->s.ntlmssp_state, pass))) {
goto fail;
}
do {
- status = ntlmssp_update(es->ntlmssp_state, blob_in, &blob_out);
+ status = ntlmssp_update(es->s.ntlmssp_state, blob_in, &blob_out);
data_blob_free(&blob_in);
if (NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED) || NT_STATUS_IS_OK(status)) {
status = enc_blob_send_receive(cli, &blob_out, &blob_in);
diff --git a/source3/libsmb/smb_seal.c b/source3/libsmb/smb_seal.c
index 63fa49046a..95012d629e 100644
--- a/source3/libsmb/smb_seal.c
+++ b/source3/libsmb/smb_seal.c
@@ -264,10 +264,10 @@ NTSTATUS common_encrypt_buffer(struct smb_trans_enc_state *es, char *buffer, cha
switch (es->smb_enc_type) {
case SMB_TRANS_ENC_NTLM:
- return common_ntlm_encrypt_buffer(es->ntlmssp_state, buffer, buf_out);
+ return common_ntlm_encrypt_buffer(es->s.ntlmssp_state, buffer, buf_out);
#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
case SMB_TRANS_ENC_GSS:
- return common_gss_encrypt_buffer(es->context_handle, buffer, buf_out);
+ return common_gss_encrypt_buffer(es->s.context_handle, buffer, buf_out);
#endif
default:
return NT_STATUS_NOT_SUPPORTED;
@@ -294,10 +294,10 @@ NTSTATUS common_decrypt_buffer(struct smb_trans_enc_state *es, char *buf)
switch (es->smb_enc_type) {
case SMB_TRANS_ENC_NTLM:
- return common_ntlm_decrypt_buffer(es->ntlmssp_state, buf);
+ return common_ntlm_decrypt_buffer(es->s.ntlmssp_state, buf);
#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
case SMB_TRANS_ENC_GSS:
- return common_gss_decrypt_buffer(es->context_handle, buf);
+ return common_gss_decrypt_buffer(es->s.context_handle, buf);
#endif
default:
return NT_STATUS_NOT_SUPPORTED;
@@ -317,8 +317,8 @@ void common_free_encryption_state(struct smb_trans_enc_state **pp_es)
}
if (es->smb_enc_type == SMB_TRANS_ENC_NTLM) {
- if (es->ntlmssp_state) {
- ntlmssp_end(&es->ntlmssp_state);
+ if (es->s.ntlmssp_state) {
+ ntlmssp_end(&es->s.ntlmssp_state);
}
}
#if defined(HAVE_GSSAPI) && defined(HAVE_KRB5)
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index e3c8b4f029..f95a982f60 100644
--- a/source3/smbd/seal.c
+++ b/source3/smbd/seal.c
@@ -63,7 +63,7 @@ static NTSTATUS make_auth_ntlmssp(struct smb_srv_trans_enc_ctx *ec)
* We must remember to update the pointer copy for the common
* functions after any auth_ntlmssp_start/auth_ntlmssp_end.
*/
- ec->es->ntlmssp_state = ec->auth_ntlmssp_state->ntlmssp_state;
+ ec->es->s.ntlmssp_state = ec->auth_ntlmssp_state->ntlmssp_state;
return status;
}
@@ -81,7 +81,7 @@ static void destroy_auth_ntlmssp(struct smb_srv_trans_enc_ctx *ec)
if (ec->auth_ntlmssp_state) {
auth_ntlmssp_end(&ec->auth_ntlmssp_state);
/* The auth_ntlmssp_end killed this already. */
- ec->es->ntlmssp_state = NULL;
+ ec->es->s.ntlmssp_state = NULL;
}
}
@@ -418,7 +418,7 @@ static NTSTATUS check_enc_good(struct smb_srv_trans_enc_ctx *ec)
}
if (ec->es->smb_enc_type == SMB_TRANS_ENC_NTLM) {
- if ((ec->es->ntlmssp_state->neg_flags & (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) !=
+ if ((ec->es->s.ntlmssp_state->neg_flags & (NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) !=
(NTLMSSP_NEGOTIATE_SIGN|NTLMSSP_NEGOTIATE_SEAL)) {
return NT_STATUS_INVALID_PARAMETER;
}