From eb3e34e965c04d286c31d6951d781a814bf4ab42 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 3 Feb 2012 11:54:32 +1100 Subject: s3-smbd Remove unused code now we always have SPNEGO via gensec This was previously needed because SPNEGO was only available in the AD DC. Andrew Bartlett Signed-off-by: Stefan Metzmacher --- source3/smbd/smb2_sesssetup.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source3/smbd/smb2_sesssetup.c') diff --git a/source3/smbd/smb2_sesssetup.c b/source3/smbd/smb2_sesssetup.c index 1a6f7697ff..c94d016c0f 100644 --- a/source3/smbd/smb2_sesssetup.c +++ b/source3/smbd/smb2_sesssetup.c @@ -235,11 +235,7 @@ static NTSTATUS smbd_smb2_auth_generic(struct smbd_smb2_session *session, gensec_want_feature(session->gensec_security, GENSEC_FEATURE_SESSION_KEY); gensec_want_feature(session->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); - if (session->sconn->use_gensec_hook) { - status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_SPNEGO); - } else { - status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_NTLMSSP); - } + status = gensec_start_mech_by_oid(session->gensec_security, GENSEC_OID_SPNEGO); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(session); return status; -- cgit