summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-10-18 21:43:40 +1100
committerStefan Metzmacher <metze@samba.org>2011-10-21 08:43:33 +0200
commit3f079885b21f22ec4f27cccaa6f59ebce0e56067 (patch)
treea53da6ce70a50a951b6cc23baf1c1d2a4f394b9e /source3/libsmb
parentb9b170a9dd640dbde0a707b972fdb0c611e68df5 (diff)
downloadsamba-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/libsmb')
-rw-r--r--source3/libsmb/clifsinfo.c4
-rw-r--r--source3/libsmb/ntlmssp_wrap.c13
2 files changed, 2 insertions, 15 deletions
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index fa8dba5fbd..1762e85d7d 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -620,8 +620,8 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
goto fail;
}
- auth_ntlmssp_want_feature(es->s.auth_ntlmssp_state, NTLMSSP_FEATURE_SESSION_KEY);
- auth_ntlmssp_want_feature(es->s.auth_ntlmssp_state, NTLMSSP_FEATURE_SEAL);
+ gensec_want_feature(es->s.auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SESSION_KEY);
+ gensec_want_feature(es->s.auth_ntlmssp_state->gensec_security, GENSEC_FEATURE_SEAL);
if (!NT_STATUS_IS_OK(status = auth_ntlmssp_set_username(es->s.auth_ntlmssp_state, user))) {
goto fail;
diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c
index a470444054..557b6e02b3 100644
--- a/source3/libsmb/ntlmssp_wrap.c
+++ b/source3/libsmb/ntlmssp_wrap.c
@@ -47,19 +47,6 @@ NTSTATUS auth_ntlmssp_set_password(struct auth_ntlmssp_state *ans,
return NT_STATUS_OK;
}
-void auth_ntlmssp_want_feature(struct auth_ntlmssp_state *ans, uint32_t feature)
-{
- if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
- gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- }
- if (feature & NTLMSSP_FEATURE_SIGN) {
- gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
- }
- if (feature & NTLMSSP_FEATURE_SEAL) {
- gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
- }
-}
-
DATA_BLOB auth_ntlmssp_get_session_key(struct auth_ntlmssp_state *ans, TALLOC_CTX *mem_ctx)
{
DATA_BLOB session_key;