diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-12-16 16:07:24 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-22 19:25:10 +0100 |
| commit | 6391fff9dad8a2bd7033930e7d6ff5c8617701c6 (patch) | |
| tree | 9ac96abf761a33af76cb3e397f71f4ebdfaaa7b9 /source3/smbd | |
| parent | 0b7bc1c45c73beddc60e6da2fc415f2506b36e43 (diff) | |
| download | samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.tar.gz samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.tar.bz2 samba-6391fff9dad8a2bd7033930e7d6ff5c8617701c6.zip | |
s3-auth rename auth_ntlmssp_state -> auth_generic_state
This structure handles more than NTLMSSP now, at least when we are an AD DC
and so changing the name may avoid some confusion in the future.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/globals.h | 2 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 2 | ||||
| -rw-r--r-- | source3/smbd/seal.c | 2 | ||||
| -rw-r--r-- | source3/smbd/sesssetup.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 76172b08ba..02527e7453 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -411,7 +411,7 @@ struct smbd_smb2_session { struct smbd_server_connection *sconn; NTSTATUS status; uint64_t vuid; - struct auth_ntlmssp_state *auth_ntlmssp_state; + struct auth_generic_state *auth_ntlmssp_state; struct auth_session_info *session_info; DATA_BLOB session_key; bool do_signing; diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 0b5b810da9..f7d277be3a 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -199,7 +199,7 @@ DATA_BLOB negprot_spnego(TALLOC_CTX *ctx, struct smbd_server_connection *sconn) OID_NTLMSSP, NULL}; const char *OIDs_ntlm[] = {OID_NTLMSSP, NULL}; - struct auth_ntlmssp_state *auth_ntlmssp_state; + struct auth_generic_state *auth_ntlmssp_state; sconn->use_gensec_hook = false; diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index 2c668dd7a0..ab87d76b26 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -79,7 +79,7 @@ bool is_encrypted_packet(struct smbd_server_connection *sconn, static NTSTATUS make_auth_ntlmssp(const struct tsocket_address *remote_address, struct smb_trans_enc_state *es) { - struct auth_ntlmssp_state *auth_ntlmssp_state; + struct auth_generic_state *auth_ntlmssp_state; NTSTATUS status = auth_ntlmssp_prepare(remote_address, &auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 889361acb8..43ff13ec28 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -420,7 +420,7 @@ static void reply_spnego_kerberos(struct smb_request *req, static void reply_spnego_ntlmssp(struct smb_request *req, uint16 vuid, - struct auth_ntlmssp_state **auth_ntlmssp_state, + struct auth_generic_state **auth_ntlmssp_state, DATA_BLOB *ntlmssp_blob, NTSTATUS nt_status, const char *OID, bool wrap) @@ -578,7 +578,7 @@ static void reply_spnego_downgrade_to_ntlmssp(struct smb_request *req, static void reply_spnego_negotiate(struct smb_request *req, uint16 vuid, DATA_BLOB blob1, - struct auth_ntlmssp_state **auth_ntlmssp_state) + struct auth_generic_state **auth_ntlmssp_state) { DATA_BLOB secblob; DATA_BLOB chal; @@ -665,7 +665,7 @@ static void reply_spnego_negotiate(struct smb_request *req, static void reply_spnego_auth(struct smb_request *req, uint16 vuid, DATA_BLOB blob1, - struct auth_ntlmssp_state **auth_ntlmssp_state) + struct auth_generic_state **auth_ntlmssp_state) { DATA_BLOB auth = data_blob_null; DATA_BLOB auth_reply = data_blob_null; |