diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-10-18 21:43:40 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-10-21 08:43:33 +0200 |
| commit | 3f079885b21f22ec4f27cccaa6f59ebce0e56067 (patch) | |
| tree | a53da6ce70a50a951b6cc23baf1c1d2a4f394b9e /source3/smbd | |
| parent | b9b170a9dd640dbde0a707b972fdb0c611e68df5 (diff) | |
| download | samba-3f079885b21f22ec4f27cccaa6f59ebce0e56067.tar.gz samba-3f079885b21f22ec4f27cccaa6f59ebce0e56067.tar.bz2 samba-3f079885b21f22ec4f27cccaa6f59ebce0e56067.zip | |
s3-ntlmssp Remove auth_ntlmssp_want_feature()
We now just call the gensec_want_feature() directly.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/seal.c | 2 | ||||
| -rw-r--r-- | source3/smbd/sesssetup.c | 6 | ||||
| -rw-r--r-- | source3/smbd/smb2_sesssetup.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c index f1508d4d4f..03313a80ac 100644 --- a/source3/smbd/seal.c +++ b/source3/smbd/seal.c @@ -94,7 +94,7 @@ static NTSTATUS make_auth_ntlmssp(const struct tsocket_address *remote_address, return nt_status_squash(status); } - auth_ntlmssp_want_feature(ec->auth_ntlmssp_state, NTLMSSP_FEATURE_SEAL); + gensec_want_feature(ec->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SEAL); status = auth_ntlmssp_start(ec->auth_ntlmssp_state); diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index 7729ff675b..5fa571a0e9 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -634,7 +634,7 @@ static void reply_spnego_negotiate(struct smb_request *req, return; } - auth_ntlmssp_want_feature(*auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY); status = auth_ntlmssp_start(*auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { @@ -746,7 +746,7 @@ static void reply_spnego_auth(struct smb_request *req, return; } - auth_ntlmssp_want_feature(*auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY); status = auth_ntlmssp_start(*auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { @@ -1155,7 +1155,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) return; } - auth_ntlmssp_want_feature(vuser->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature(vuser->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY); if (sconn->use_gensec_hook) { status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_SPNEGO); diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 059b26f0bf..6e06b9fe00 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -381,7 +381,7 @@ static NTSTATUS smbd_smb2_spnego_negotiate(struct smbd_smb2_session *session, goto out; } - auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature(session->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY); status = auth_ntlmssp_start(session->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { @@ -572,7 +572,7 @@ static NTSTATUS smbd_smb2_spnego_auth(struct smbd_smb2_session *session, return status; } - auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature(session->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY); status = auth_ntlmssp_start(session->auth_ntlmssp_state); if (!NT_STATUS_IS_OK(status)) { @@ -648,7 +648,7 @@ static NTSTATUS smbd_smb2_raw_ntlmssp_auth(struct smbd_smb2_session *session, return status; } - auth_ntlmssp_want_feature(session->auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY); + gensec_want_feature(session->auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY); if (session->sconn->use_gensec_hook) { status = auth_generic_start(session->auth_ntlmssp_state, GENSEC_OID_SPNEGO); |