diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-03 11:54:32 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-02-16 15:18:43 +0100 |
| commit | eb3e34e965c04d286c31d6951d781a814bf4ab42 (patch) | |
| tree | 100158bc2fc9eca4e19faf630fe933f50ca910c7 /source3/smbd/sesssetup.c | |
| parent | 2b511f0e9280e0b918265bac8090d79d3c9d5115 (diff) | |
| download | samba-eb3e34e965c04d286c31d6951d781a814bf4ab42.tar.gz samba-eb3e34e965c04d286c31d6951d781a814bf4ab42.tar.bz2 samba-eb3e34e965c04d286c31d6951d781a814bf4ab42.zip | |
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 <metze@samba.org>
Diffstat (limited to 'source3/smbd/sesssetup.c')
| -rw-r--r-- | source3/smbd/sesssetup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c index c93ab7904e..1741f4ff90 100644 --- a/source3/smbd/sesssetup.c +++ b/source3/smbd/sesssetup.c @@ -228,12 +228,9 @@ static void reply_sesssetup_and_X_spnego(struct smb_request *req) gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_SESSION_KEY); gensec_want_feature(vuser->gensec_security, GENSEC_FEATURE_UNIX_TOKEN); - if (sconn->use_gensec_hook) { - status = gensec_start_mech_by_oid(vuser->gensec_security, GENSEC_OID_SPNEGO); - } else { - status = gensec_start_mech_by_oid(vuser->gensec_security, GENSEC_OID_NTLMSSP); - } + status = gensec_start_mech_by_oid(vuser->gensec_security, GENSEC_OID_SPNEGO); if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Failed to start SPNEGO handler!\n")); /* Kill the intermediate vuid */ invalidate_vuid(sconn, vuid); reply_nterror(req, nt_status_squash(status)); |