summaryrefslogtreecommitdiff
path: root/source3/smbd/sesssetup.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-12-16 16:38:53 +1100
committerStefan Metzmacher <metze@samba.org>2011-12-22 19:25:10 +0100
commitc17131685cc7febea6f09c7029c26e9993f8bc91 (patch)
treeff1b1eeff6ea82ee756a6f61265c569cb038832b /source3/smbd/sesssetup.c
parent1100f6eca568bdf725922eff09988559d2714e45 (diff)
downloadsamba-c17131685cc7febea6f09c7029c26e9993f8bc91.tar.gz
samba-c17131685cc7febea6f09c7029c26e9993f8bc91.tar.bz2
samba-c17131685cc7febea6f09c7029c26e9993f8bc91.zip
s3-auth remove auth_ntlmssp_start(), call auth_generic_start() directly
This makes it clear that this can support more than just NTLMSSP. Andrew Bartlett Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd/sesssetup.c')
-rw-r--r--source3/smbd/sesssetup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index b7daa9e4f0..04783a4fcd 100644
--- a/source3/smbd/sesssetup.c
+++ b/source3/smbd/sesssetup.c
@@ -636,7 +636,7 @@ static void reply_spnego_negotiate(struct smb_request *req,
gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(*auth_ntlmssp_state);
+ status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
/* Kill the intermediate vuid */
invalidate_vuid(sconn, vuid);
@@ -748,7 +748,7 @@ static void reply_spnego_auth(struct smb_request *req,
gensec_want_feature((*auth_ntlmssp_state)->gensec_security, GENSEC_FEATURE_SESSION_KEY);
- status = auth_ntlmssp_start(*auth_ntlmssp_state);
+ status = auth_generic_start(*auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
if (!NT_STATUS_IS_OK(status)) {
/* Kill the intermediate vuid */
invalidate_vuid(sconn, vuid);
@@ -1160,7 +1160,7 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req)
if (sconn->use_gensec_hook) {
status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_SPNEGO);
} else {
- status = auth_ntlmssp_start(vuser->auth_ntlmssp_state);
+ status = auth_generic_start(vuser->auth_ntlmssp_state, GENSEC_OID_NTLMSSP);
}
if (!NT_STATUS_IS_OK(status)) {
/* Kill the intermediate vuid */